adding new environmental variables for added debugging: COLLECTOR_LOG_FILE, COLLECTOR_DEBUG, DEBUG, SCRUTINY_LOG_FILE, SCRUTINY_DEBUG

webapp/backend/pkg/web/middleware/sqlite3.go

@@ -2,21 +2,23 @@ package middleware
 
 import (
 	"fmt"
+	"github.com/analogj/scrutiny/webapp/backend/pkg/config"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/models/db"
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm/dialects/sqlite"
+	"github.com/sirupsen/logrus"
 )
 
-func DatabaseMiddleware(dbPath string) gin.HandlerFunc {
+func DatabaseMiddleware(appConfig config.Interface, logger logrus.FieldLogger) gin.HandlerFunc {
 	//var database *gorm.DB
-	fmt.Printf("Trying to connect to database stored: %s", dbPath)
-	database, err := gorm.Open("sqlite3", dbPath)
-
+	fmt.Printf("Trying to connect to database stored: %s\n", appConfig.GetString("web.database.location"))
+	database, err := gorm.Open("sqlite3", appConfig.GetString("web.database.location"))
 	if err != nil {
 		panic("Failed to connect to database!")
 	}
 
+	database.SetLogger(&GormLogger{Logger: logger})
 	database.AutoMigrate(&db.Device{})
 	database.AutoMigrate(&db.SelfTest{})
 	database.AutoMigrate(&db.Smart{})
@@ -30,3 +32,24 @@ func DatabaseMiddleware(dbPath string) gin.HandlerFunc {
 		c.Next()
 	}
 }
+
+// GormLogger is a custom logger for Gorm, making it use logrus.
+type GormLogger struct{ Logger logrus.FieldLogger }
+
+// Print handles log events from Gorm for the custom logger.
+func (gl *GormLogger) Print(v ...interface{}) {
+	switch v[0] {
+	case "sql":
+		gl.Logger.WithFields(
+			logrus.Fields{
+				"module":  "gorm",
+				"type":    "sql",
+				"rows":    v[5],
+				"src_ref": v[1],
+				"values":  v[4],
+			},
+		).Debug(v[3])
+	case "log":
+		gl.Logger.WithFields(logrus.Fields{"module": "gorm", "type": "log"}).Print(v[2])
+	}
+}