!!!!WIP!!!!

adding InfluxDB

- influxdb added to dockerfile
- influxdb s6 service
- influxdb config
- adding defaults to config
- creating a DeviceRepo interface (multiple db backends)
- implemented DeviceRepo interface as ScruitnyRepository

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

@@ -0,0 +1,22 @@
+package middleware
+
+import (
+	"github.com/analogj/scrutiny/webapp/backend/pkg/config"
+	"github.com/analogj/scrutiny/webapp/backend/pkg/database"
+	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
+)
+
+func RepositoryMiddleware(appConfig config.Interface, globalLogger logrus.FieldLogger) gin.HandlerFunc {
+
+	deviceRepo, err := database.NewScrutinyRepository(appConfig, globalLogger)
+	if err != nil {
+		panic(err)
+	}
+
+	//TODO: determine where we can call defer deviceRepo.Close()
+	return func(c *gin.Context) {
+		c.Set("DEVICE_REPOSITORY", deviceRepo)
+		c.Next()
+	}
+}

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

@@ -1,59 +0,0 @@
-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/sirupsen/logrus"
-	"gorm.io/driver/sqlite"
-	"gorm.io/gorm"
-)
-
-func DatabaseMiddleware(appConfig config.Interface, globalLogger logrus.FieldLogger) gin.HandlerFunc {
-
-	//var database *gorm.DB
-	fmt.Printf("Trying to connect to database stored: %s\n", appConfig.GetString("web.database.location"))
-	database, err := gorm.Open(sqlite.Open(appConfig.GetString("web.database.location")), &gorm.Config{
-		//TODO: figure out how to log database queries again.
-		//Logger: logger
-	})
-	if err != nil {
-		panic("Failed to connect to database!")
-	}
-
-	//database.SetLogger()
-	database.AutoMigrate(&db.Device{})
-	database.AutoMigrate(&db.SelfTest{})
-	database.AutoMigrate(&db.Smart{})
-	database.AutoMigrate(&db.SmartAtaAttribute{})
-	database.AutoMigrate(&db.SmartNvmeAttribute{})
-	database.AutoMigrate(&db.SmartScsiAttribute{})
-
-	//TODO: detrmine where we can call defer database.Close()
-	return func(c *gin.Context) {
-		c.Set("DB", database)
-		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])
-	}
-}