simplify logger creation (move logic into a function in main packages)

Ensure logger creation is consistent between Web and Collector
Create logger in main, pass down to downstream functions (like gin)
In debug mode, print a copy of AppConfig
Better debugging for logger.

webapp/backend/pkg/web/handler/delete_device.go

@@ -8,7 +8,7 @@ import (
 )
 
 func DeleteDevice(c *gin.Context) {
-	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
+	logger := c.MustGet("LOGGER").(*logrus.Entry)
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
 
 	err := deviceRepo.DeleteDevice(c, c.Param("wwn"))

webapp/backend/pkg/web/handler/get_device_details.go

@@ -9,7 +9,7 @@ import (
 )
 
 func GetDeviceDetails(c *gin.Context) {
-	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
+	logger := c.MustGet("LOGGER").(*logrus.Entry)
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
 
 	device, err := deviceRepo.GetDeviceDetails(c, c.Param("wwn"))

webapp/backend/pkg/web/handler/get_devices_summary.go

@@ -8,7 +8,7 @@ import (
 )
 
 func GetDevicesSummary(c *gin.Context) {
-	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
+	logger := c.MustGet("LOGGER").(*logrus.Entry)
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
 
 	summary, err := deviceRepo.GetSummary(c)

webapp/backend/pkg/web/handler/get_devices_summary_temp_history.go

@@ -8,7 +8,7 @@ import (
 )
 
 func GetDevicesSummaryTempHistory(c *gin.Context) {
-	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
+	logger := c.MustGet("LOGGER").(*logrus.Entry)
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
 
 	durationKey, exists := c.GetQuery("duration_key")

webapp/backend/pkg/web/handler/get_settings.go

@@ -8,7 +8,7 @@ import (
 )
 
 func GetSettings(c *gin.Context) {
-	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
+	logger := c.MustGet("LOGGER").(*logrus.Entry)
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
 
 	settings, err := deviceRepo.LoadSettings(c)

webapp/backend/pkg/web/handler/register_devices.go

@@ -13,7 +13,7 @@ import (
 // This function is run everytime a collector is about to start a run. It can be used to update device metadata.
 func RegisterDevices(c *gin.Context) {
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
-	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
+	logger := c.MustGet("LOGGER").(*logrus.Entry)
 
 	var collectorDeviceWrapper models.DeviceWrapper
 	err := c.BindJSON(&collectorDeviceWrapper)

webapp/backend/pkg/web/handler/save_settings.go

@@ -9,7 +9,7 @@ import (
 )
 
 func SaveSettings(c *gin.Context) {
-	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
+	logger := c.MustGet("LOGGER").(*logrus.Entry)
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
 
 	var settings models.Settings

webapp/backend/pkg/web/handler/send_test_notification.go

@@ -13,7 +13,7 @@ import (
 // Send test notification
 func SendTestNotification(c *gin.Context) {
 	appConfig := c.MustGet("CONFIG").(config.Interface)
-	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
+	logger := c.MustGet("LOGGER").(*logrus.Entry)
 
 	testNotify := notify.New(
 		logger,

webapp/backend/pkg/web/handler/upload_device_metrics.go

@@ -14,7 +14,7 @@ import (
 
 func UploadDeviceMetrics(c *gin.Context) {
 	//db := c.MustGet("DB").(*gorm.DB)
-	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
+	logger := c.MustGet("LOGGER").(*logrus.Entry)
 	appConfig := c.MustGet("CONFIG").(config.Interface)
 	//influxWriteDb := c.MustGet("INFLUXDB_WRITE").(*api.WriteAPIBlocking)
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)

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

@@ -28,7 +28,7 @@ import (
 var timeFormat = "02/Jan/2006:15:04:05 -0700"
 
 // Logger is the logrus logger handler
-func LoggerMiddleware(logger logrus.FieldLogger) gin.HandlerFunc {
+func LoggerMiddleware(logger *logrus.Entry) gin.HandlerFunc {
 
 	hostname, err := os.Hostname()
 	if err != nil {

webapp/backend/pkg/web/server.go

@@ -9,18 +9,17 @@ import (
 	"github.com/analogj/scrutiny/webapp/backend/pkg/web/middleware"
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
-	"io"
 	"net/http"
-	"os"
 	"path/filepath"
 	"strings"
 )
 
 type AppEngine struct {
 	Config config.Interface
+	Logger *logrus.Entry
 }
 
-func (ae *AppEngine) Setup(logger logrus.FieldLogger) *gin.Engine {
+func (ae *AppEngine) Setup(logger *logrus.Entry) *gin.Engine {
 	r := gin.New()
 
 	r.Use(middleware.LoggerMiddleware(logger))
@@ -36,6 +35,10 @@ func (ae *AppEngine) Setup(logger logrus.FieldLogger) *gin.Engine {
 		api := base.Group("/api")
 		{
 			api.GET("/health", func(c *gin.Context) {
+				//TODO:
+				// check if the /web folder is populated.
+				// check if access to influxdb
+				// check if access to sqlitedb.
 				c.JSON(http.StatusOK, gin.H{
 					"success": true,
 				})
@@ -77,26 +80,6 @@ func (ae *AppEngine) Start() error {
 		gin.SetMode(gin.DebugMode)
 	}
 
-	logger := logrus.New()
-	//set default log level
-	logLevel, err := logrus.ParseLevel(ae.Config.GetString("log.level"))
-	if err != nil {
-		return err
-	}
-	logger.SetLevel(logLevel)
-	//set the log file if present
-	if len(ae.Config.GetString("log.file")) != 0 {
-		logFile, err := os.OpenFile(ae.Config.GetString("log.file"), os.O_CREATE|os.O_WRONLY, 0644)
-		defer logFile.Close()
-		if err != nil {
-			logrus.Errorf("Failed to open log file %s for output: %s", ae.Config.GetString("log.file"), err)
-			return err
-		}
-
-		//configure the logrus default
-		logger.SetOutput(io.MultiWriter(os.Stderr, logFile))
-	}
-
 	//check if the database parent directory exists, fail here rather than in a handler.
 	if !utils.FileExists(filepath.Dir(ae.Config.GetString("web.database.location"))) {
 		return errors.ConfigValidationError(fmt.Sprintf(
@@ -104,7 +87,7 @@ func (ae *AppEngine) Start() error {
 			filepath.Dir(ae.Config.GetString("web.database.location"))))
 	}
 
-	r := ae.Setup(logger)
+	r := ae.Setup(ae.Logger)
 
 	return r.Run(fmt.Sprintf("%s:%s", ae.Config.GetString("web.listen.host"), ae.Config.GetString("web.listen.port")))
 }