Maxi/InfantrySkillCalculator
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Activity

Entire logging rework. Full error handling. Small improvements.

Browse Source
This commit is contained in:
MaxJa4
2024-01-22 17:24:17 +01:00
parent da1ff4e4e5
commit ca697da0da
18 changed files with 278 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
main.go
View File

@@ -16,7 +16,10 @@ import (
)
func init() {
f, _ := os.OpenFile("isc_rest.log", os.O_RDWR|os.O_APPEND|os.O_CREATE, 0660)
f, err := os.OpenFile("isc_rest.log", os.O_RDWR|os.O_APPEND|os.O_CREATE, 0660)
if err != nil {
utils.Logger.Fatalf("[MAIN] Error opening log file: %v", err)
}
ginWriter := io.MultiWriter(f, os.Stdout)
logger := logrus.New()
logger.SetOutput(ginWriter)
@@ -26,7 +29,6 @@ func init() {
})
utils.Logger = logger
var err error
utils.MainPageTemplates, err = template.ParseFiles(
"./templates/index.html",
"./templates/components/home_clan_bar.html",
@@ -45,7 +47,7 @@ func init() {
"./templates/components/header.html",
)
if err != nil {
logger.Fatal(err)
logger.Fatalf("[MAIN] Error parsing main page templates: %v", err)
}
utils.LoginPageTemplates, err = template.ParseFiles(
@@ -53,7 +55,7 @@ func init() {
"./templates/components/header.html",
)
if err != nil {
logger.Fatal(err)
logger.Fatalf("[MAIN] Error parsing login page templates: %v", err)
}
utils.RegisterPageTemplates, err = template.ParseFiles(
@@ -61,14 +63,14 @@ func init() {
"./templates/components/header.html",
)
if err != nil {
logger.Fatal(err)
logger.Fatalf("[MAIN] Error parsing register page templates: %v", err)
}
utils.PlayerItemTemplate, err = template.ParseFiles(
"./templates/shards/player_list_item.html",
)
if err != nil {
logger.Fatal(err)
logger.Fatalf("[MAIN] Error parsing player list item template: %v", err)
}
controllers.LoadMetrics()
@@ -92,9 +94,9 @@ func customLogrusLogger(logger *logrus.Logger) gin.HandlerFunc {
username = "Anonymous"
}
logger.Infof("[GIN] %3d | %10v | %15s | %15s | %-7s | %s",
logger.Infof("[GIN] %3d | %10.3fms | %15s | %15s | %-7s | %s",
c.Writer.Status(),
elapsed,
float64(elapsed.Microseconds())/1000.0,
c.ClientIP(),
username,
c.Request.Method,
@@ -111,7 +113,7 @@ func main() {
router := gin.New()
err := router.SetTrustedProxies([]string{"127.0.0.1"})
if err != nil {
utils.Logger.Fatal(err)
utils.Logger.Fatalf("[MAIN] Error setting trusted proxies: %v", err)
}
router.LoadHTMLGlob("templates/**/*")
reader := router.Group("/")
@@ -128,7 +130,7 @@ func main() {
if err := models.DB.First(&code).Error; err != nil {
firstCode := utils.GenerateActivationCode()
models.DB.Create(&models.ActivationCode{Code: firstCode, UserRole: models.AdminRole})
utils.Logger.Println("Created first activation code with ADMIN role:\n" + firstCode)
utils.Logger.Println("[MAIN] Created first activation code with ADMIN role:\n" + firstCode)
}
router.Static("/static", "./static")
@@ -161,7 +163,6 @@ func main() {
reader.GET("/players", controllers.GetAllPlayers)
reader.GET("/players_html", controllers.GetPlayersByClanHTML)
reader.GET("/player/:id", controllers.GetPlayerByID)
reader.GET("/playerid/:name", controllers.GetPlayerIDByName)
author.POST("/player", controllers.AddPlayer)
author.PATCH("/player/:id", controllers.UpdatePlayerByID)
author.DELETE("/player/:id", controllers.DeletePlayerByID)
@@ -182,6 +183,6 @@ func main() {
admin.DELETE("/purge_clans", controllers.DeleteAllClans)
admin.POST("/create_code", controllers.CreateCode)
utils.Logger.Println("Running on 8000...")
utils.Logger.Fatal(router.Run(":8000"))
utils.Logger.Println("[MAIN] Running on 8000...")
utils.Logger.Fatalf("[MAIN] %v", router.Run(":8000"))
}