Implement KeepUpdated. Switch to Logrus logger. Relocate score-related functions.

main.go

@@ -6,13 +6,26 @@ import (
 	"InfantrySkillCalculator/utils"
 	"github.com/gin-gonic/gin"
 	_ "github.com/gorilla/sessions"
+	"github.com/sirupsen/logrus"
 	"html/template"
 	"io"
-	"log"
 	"os"
+	"session"
+	"strings"
+	"time"
 )
 
 func init() {
+	f, _ := os.OpenFile("isc_rest.log", os.O_RDWR|os.O_APPEND|os.O_CREATE, 0660)
+	ginWriter := io.MultiWriter(f, os.Stdout)
+	logger := logrus.New()
+	logger.SetOutput(ginWriter)
+	logger.SetFormatter(&logrus.TextFormatter{
+		ForceColors:   true,
+		FullTimestamp: true,
+	})
+	utils.Logger = logger
+
 	var err error
 	utils.MainPageTemplates, err = template.ParseFiles(
 		"./templates/index.html",
@@ -27,12 +40,12 @@ func init() {
 		"./templates/modals/add_player.html",
 		"./templates/modals/delete_player.html",
 		"./templates/modals/edit_player.html",
-		"./templates/modals/settings.html",
+		//"./templates/modals/settings.html",
 		"./templates/modals/full_calc.html",
 		"./templates/components/header.html",
 	)
 	if err != nil {
-		log.Fatal(err)
+		logger.Fatal(err)
 	}
 
 	utils.LoginPageTemplates, err = template.ParseFiles(
@@ -40,7 +53,7 @@ func init() {
 		"./templates/components/header.html",
 	)
 	if err != nil {
-		log.Fatal(err)
+		logger.Fatal(err)
 	}
 
 	utils.RegisterPageTemplates, err = template.ParseFiles(
@@ -48,19 +61,48 @@ func init() {
 		"./templates/components/header.html",
 	)
 	if err != nil {
-		log.Fatal(err)
+		logger.Fatal(err)
 	}
 
 	utils.PlayerItemTemplate, err = template.ParseFiles(
 		"./templates/shards/player_list_item.html",
 	)
 	if err != nil {
-		log.Fatal(err)
+		logger.Fatal(err)
 	}
 
 	controllers.LoadMetrics()
 }
 
+func customLogrusLogger(logger *logrus.Logger) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		start := time.Now()
+
+		c.Next()
+
+		elapsed := time.Since(start)
+
+		if c.Request.URL.Path == "/static" || c.Request.URL.Path == "/favicon.ico" ||
+			strings.Contains(c.Request.URL.Path, "_html") {
+			return
+		}
+
+		username, exists := session.GetUsername(c)
+		if !exists {
+			username = "Anonymous"
+		}
+
+		logger.Infof("[GIN] %3d | %10v | %15s | %15s | %-7s | %s",
+			c.Writer.Status(),
+			elapsed,
+			c.ClientIP(),
+			username,
+			c.Request.Method,
+			c.Request.RequestURI,
+		)
+	}
+}
+
 func main() {
 	if os.Getenv("GO_ENV") == "production" {
 		gin.SetMode(gin.ReleaseMode)
@@ -69,7 +111,7 @@ func main() {
 	router := gin.New()
 	err := router.SetTrustedProxies([]string{"127.0.0.1"})
 	if err != nil {
-		log.Fatal(err)
+		utils.Logger.Fatal(err)
 	}
 	router.LoadHTMLGlob("templates/**/*")
 	reader := router.Group("/")
@@ -80,37 +122,26 @@ func main() {
 	admin.Use(AdminAuthRequired())
 
 	models.ConnectDatabase()
-	models.ConnectCache(utils.PlayerCacheLifetime)
+	models.ConnectCache(utils.PlayerCacheLifetime, controllers.UpdateCacheAfterExpiry)
 
 	var code models.ActivationCode
 	if err := models.DB.First(&code).Error; err != nil {
 		firstCode := utils.GenerateActivationCode()
 		models.DB.Create(&models.ActivationCode{Code: firstCode, UserRole: models.AdminRole})
-		log.Println("Created first activation code with ADMIN role:\n" + firstCode)
+		utils.Logger.Println("Created first activation code with ADMIN role:\n" + firstCode)
 	}
 
 	router.Static("/static", "./static")
-	router.Static("/node_modules", "./node_modules")
 
-	f, _ := os.OpenFile("isc_rest.log", os.O_RDWR|os.O_APPEND|os.O_CREATE, 0660)
-	utils.GinWriter = io.MultiWriter(f, os.Stdout)
-	logger := gin.LoggerWithWriter(utils.GinWriter, "/static/", "/node_modules/", "/favicon.ico")
-	router.Use(
-		logger,
+	middlewares := []gin.HandlerFunc{
+		customLogrusLogger(utils.Logger),
 		gin.Recovery(),
-	)
-	reader.Use(
-		logger,
-		gin.Recovery(),
-	)
-	author.Use(
-		logger,
-		gin.Recovery(),
-	)
-	admin.Use(
-		logger,
-		gin.Recovery(),
-	)
+	}
+
+	router.Use(middlewares...)
+	reader.Use(middlewares...)
+	author.Use(middlewares...)
+	admin.Use(middlewares...)
 
 	router.GET("/login", loginPage)
 	router.POST("/login", loginPost)
@@ -151,6 +182,6 @@ func main() {
 	admin.DELETE("/purge_clans", controllers.DeleteAllClans)
 	admin.POST("/create_code", controllers.CreateCode)
 
-	log.Println("Running on 8000...")
-	log.Fatal(router.Run(":8000"))
+	utils.Logger.Println("Running on 8000...")
+	utils.Logger.Fatal(router.Run(":8000"))
 }