add experimental plugin system

logger/hclog_adapter.go

@@ -0,0 +1,66 @@
+package logger
+
+import (
+	"io"
+	"log"
+
+	"github.com/hashicorp/go-hclog"
+	"github.com/rs/zerolog"
+)
+
+type HCLogAdapter struct {
+	hclog.Logger
+}
+
+func (l *HCLogAdapter) Log(level hclog.Level, msg string, args ...interface{}) {
+	var ev *zerolog.Event
+	switch level {
+	case hclog.Info:
+		ev = logger.Info()
+	case hclog.Warn:
+		ev = logger.Warn()
+	case hclog.Error:
+		ev = logger.Error()
+	default:
+		ev = logger.Debug()
+	}
+	ev.Timestamp().Str("sender", l.Name())
+	addKeysAndValues(ev, args...)
+	ev.Msg(msg)
+}
+
+func (l *HCLogAdapter) Trace(msg string, args ...interface{}) {
+	l.Log(hclog.Debug, msg, args...)
+}
+
+func (l *HCLogAdapter) Debug(msg string, args ...interface{}) {
+	l.Log(hclog.Debug, msg, args...)
+}
+
+func (l *HCLogAdapter) Info(msg string, args ...interface{}) {
+	l.Log(hclog.Info, msg, args...)
+}
+
+func (l *HCLogAdapter) Warn(msg string, args ...interface{}) {
+	l.Log(hclog.Warn, msg, args...)
+}
+
+func (l *HCLogAdapter) Error(msg string, args ...interface{}) {
+	l.Log(hclog.Error, msg, args...)
+}
+
+func (l *HCLogAdapter) With(args ...interface{}) hclog.Logger {
+	return &HCLogAdapter{Logger: l.Logger.With(args...)}
+}
+
+func (l *HCLogAdapter) Named(name string) hclog.Logger {
+	return &HCLogAdapter{Logger: l.Logger.Named(name)}
+}
+
+func (l *HCLogAdapter) StandardLogger(opts *hclog.StandardLoggerOptions) *log.Logger {
+	return log.New(&StdLoggerWrapper{Sender: l.Name()}, "", 0)
+}
+
+func (l *HCLogAdapter) StandardWriter(opts *hclog.StandardLoggerOptions) io.Writer {
+	return &StdLoggerWrapper{Sender: l.Name()}
+}

logger/logger.go

@@ -63,7 +63,7 @@ type LeveledLogger struct {
 	Sender string
 }
 
-func (l *LeveledLogger) addKeysAndValues(ev *zerolog.Event, keysAndValues ...interface{}) {
+func addKeysAndValues(ev *zerolog.Event, keysAndValues ...interface{}) {
 	kvLen := len(keysAndValues)
 	if kvLen%2 != 0 {
 		extra := keysAndValues[kvLen-1]
@@ -71,7 +71,7 @@ func (l *LeveledLogger) addKeysAndValues(ev *zerolog.Event, keysAndValues ...int
 	}
 	for i := 0; i < len(keysAndValues); i += 2 {
 		key, val := keysAndValues[i], keysAndValues[i+1]
-		if keyStr, ok := key.(string); ok {
+		if keyStr, ok := key.(string); ok && keyStr != "timestamp" {
 			ev.Str(keyStr, fmt.Sprintf("%v", val))
 		}
 	}
@@ -81,7 +81,7 @@ func (l *LeveledLogger) addKeysAndValues(ev *zerolog.Event, keysAndValues ...int
 func (l *LeveledLogger) Error(msg string, keysAndValues ...interface{}) {
 	ev := logger.Error()
 	ev.Timestamp().Str("sender", l.Sender)
-	l.addKeysAndValues(ev, keysAndValues...)
+	addKeysAndValues(ev, keysAndValues...)
 	ev.Msg(msg)
 }
 
@@ -89,7 +89,7 @@ func (l *LeveledLogger) Error(msg string, keysAndValues ...interface{}) {
 func (l *LeveledLogger) Info(msg string, keysAndValues ...interface{}) {
 	ev := logger.Info()
 	ev.Timestamp().Str("sender", l.Sender)
-	l.addKeysAndValues(ev, keysAndValues...)
+	addKeysAndValues(ev, keysAndValues...)
 	ev.Msg(msg)
 }
 
@@ -97,7 +97,7 @@ func (l *LeveledLogger) Info(msg string, keysAndValues ...interface{}) {
 func (l *LeveledLogger) Debug(msg string, keysAndValues ...interface{}) {
 	ev := logger.Debug()
 	ev.Timestamp().Str("sender", l.Sender)
-	l.addKeysAndValues(ev, keysAndValues...)
+	addKeysAndValues(ev, keysAndValues...)
 	ev.Msg(msg)
 }
 
@@ -105,7 +105,7 @@ func (l *LeveledLogger) Debug(msg string, keysAndValues ...interface{}) {
 func (l *LeveledLogger) Warn(msg string, keysAndValues ...interface{}) {
 	ev := logger.Warn()
 	ev.Timestamp().Str("sender", l.Sender)
-	l.addKeysAndValues(ev, keysAndValues...)
+	addKeysAndValues(ev, keysAndValues...)
 	ev.Msg(msg)
 }
 

logger/request_logger.go

@@ -8,7 +8,7 @@ import (
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/rs/zerolog"
 
-	"github.com/drakkan/sftpgo/v2/metrics"
+	"github.com/drakkan/sftpgo/v2/metric"
 )
 
 // StructuredLogger defines a simple wrapper around zerolog logger.
@@ -56,7 +56,7 @@ func (l *StructuredLogger) NewLogEntry(r *http.Request) middleware.LogEntry {
 
 // Write logs a new entry at the end of the HTTP request
 func (l *StructuredLoggerEntry) Write(status, bytes int, header http.Header, elapsed time.Duration, extra interface{}) {
-	metrics.HTTPRequestServed(status)
+	metric.HTTPRequestServed(status)
 	l.Logger.Info().
 		Timestamp().
 		Str("sender", "httpd").