Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 06:40:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

improve logging

Browse Source 
this partially revert #45
This commit is contained in:
Nicola Murino
2019-09-06 15:19:01 +02:00
parent abbb7f272b
commit 4f1c2c094f
11 changed files with 155 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sftpd/sftpd.go
View File

@@ -34,11 +34,6 @@ const (
operationRename = "rename"
protocolSFTP = "SFTP"
protocolSCP = "SCP"
Debug = "debug"
Info = "info"
Warn = "warn"
Error = "error"
)
var (
@@ -178,7 +173,7 @@ func CloseActiveConnection(connectionID string) bool {
defer mutex.RUnlock()
for _, c := range openConnections {
if c.ID == connectionID {
c.Log(Debug, logSender, "closing connection")
c.Log(logger.LevelDebug, logSender, "closing connection")
c.sshConn.Close()
result = true
break
@@ -252,17 +247,17 @@ func CheckIdleConnections() {
if t.connectionID == c.ID {
transferIdleTime := time.Since(t.lastActivity)
if transferIdleTime < idleTime {
c.Log(Debug, logSender, "idle time: %v setted to transfer idle time: %v",
c.Log(logger.LevelDebug, logSender, "idle time: %v setted to transfer idle time: %v",
idleTime, transferIdleTime)
idleTime = transferIdleTime
}
}
}
if idleTime > idleTimeout {
c.Log(Info, logSender, "close idle connection, idle time: %v", idleTime)
c.Log(logger.LevelInfo, logSender, "close idle connection, idle time: %v", idleTime)
err := c.sshConn.Close()
if err != nil {
c.Log(Warn, logSender, "idle connection close failed: %v", err)
c.Log(logger.LevelWarn, logSender, "idle connection close failed: %v", err)
}
}
}
@@ -273,7 +268,7 @@ func addConnection(id string, c Connection) {
mutex.Lock()
defer mutex.Unlock()
openConnections[id] = c
c.Log(Debug, logSender, "connection added, num open connections: %v", len(openConnections))
c.Log(logger.LevelDebug, logSender, "connection added, num open connections: %v", len(openConnections))
}
func removeConnection(id string) {
@@ -281,7 +276,7 @@ func removeConnection(id string) {
defer mutex.Unlock()
c := openConnections[id]
delete(openConnections, id)
c.Log(Debug, logSender, "connection removed, num open connections: %v", len(openConnections))
c.Log(logger.LevelDebug, logSender, "connection removed, num open connections: %v", len(openConnections))
}
func addTransfer(transfer *Transfer) {