chore: change info message in migration (resolve #128)

main.go

@@ -171,10 +171,7 @@ func main() {
 
 	// Globally used middlewares
 	recoveryMiddleware := handlers.RecoveryHandler()
-	loggingMiddleware := middlewares.NewLoggingMiddleware(
+	loggingMiddleware := middlewares.NewLoggingMiddleware(logbuch.Info, []string{"/assets"})
-		log.New(os.Stdout, "", log.LstdFlags),
-		[]string{"/assets"},
-	)
 
 	// Router configs
 	router.Use(loggingMiddleware, recoveryMiddleware)

middlewares/logging.go

@@ -4,23 +4,24 @@ package middlewares
 
 import (
 	"io"
-	"log"
 	"net/http"
 	"strings"
 	"time"
 )
 
+type logFunc func(string, ...interface{})
+
 type LoggingMiddleware struct {
 	handler         http.Handler
-	output          *log.Logger
+	logFunc         logFunc
 	excludePrefixes []string
 }
 
-func NewLoggingMiddleware(output *log.Logger, excludePrefixes []string) func(http.Handler) http.Handler {
+func NewLoggingMiddleware(logFunc logFunc, excludePrefixes []string) func(http.Handler) http.Handler {
 	return func(h http.Handler) http.Handler {
 		return &LoggingMiddleware{
 			handler:         h,
-			output:          output,
+			logFunc:         logFunc,
 			excludePrefixes: excludePrefixes,
 		}
 	}
@@ -41,9 +42,8 @@ func (lg *LoggingMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	lg.output.Printf(
+	lg.logFunc(
-		"%v status=%d, method=%s, uri=%s, duration=%v, bytes=%d, addr=%s\n",
+		"[request] status=%d, method=%s, uri=%s, duration=%v, bytes=%d, addr=%s, user=%s\n",
-		time.Now().Format(time.RFC3339Nano),
 		ww.Status(),
 		r.Method,
 		r.URL.String(),

migrations/20210206_drop_badges_column_add_sharing_flags.go

@@ -37,11 +37,15 @@ func init() {
 				return err
 			}
 
+			if cfg.Db.Dialect == config.SQLDialectSqlite {
+				logbuch.Info("not attempting to drop column 'badges_enabled' on sqlite")
+				return nil
+			}
+
 			if err := migrator.DropColumn(&models.User{}, "badges_enabled"); err != nil {
 				return err
-			} else {
-				logbuch.Info("dropped column 'badges_enabled' after substituting it by sharing indicators")
 			}
+			logbuch.Info("dropped column 'badges_enabled' after substituting it by sharing indicators")
 
 			return nil
 		},

version.txt

@@ -1 +1 @@
-1.24.1
+1.24.3