Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-08 15:28:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor the logging system

Browse Source 
* created a "Log" function for type "Connection"
* created a "log" function for type "Provider"
* replace logger calls to Log/log where possible

I also renamed PGSSQL to PGSQL, as this seemed to be a typo

Signed-off-by: Jo Vandeginste <Jo.Vandeginste@kuleuven.be>
This commit is contained in:
Jo Vandeginste
2019-09-06 11:23:06 +02:00
committed by drakkan
parent a7363a16be
commit abbb7f272b
11 changed files with 176 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sftpd/sftpd.go
View File

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