From 3263cf3f8c6f852b261a28dff6d74a312756e75c Mon Sep 17 00:00:00 2001 From: Paras Khandelwal Date: Mon, 8 Dec 2025 19:42:39 +0530 Subject: [PATCH] Colored Logging & Improved Backend Logs and it's implemented. charmbracelet/log, integrated via log.NewWithOptions(os.Stderr, log.Options{}), automatically provides colored output based on log levels if the terminal supports ANSI. --- backend/controllers/app_handlers.go | 9 +++--- backend/controllers/job_queue.go | 10 +++---- backend/controllers/websocket.go | 15 +++++----- backend/go.mod | 21 +++++++++++-- backend/go.sum | 46 ++++++++++++++++++++++++----- backend/main.go | 15 +++++----- backend/models/logs.go | 14 +++++++++ backend/utils/logger.go | 26 ++++++++++++++++ 8 files changed, 122 insertions(+), 34 deletions(-) create mode 100644 backend/utils/logger.go diff --git a/backend/controllers/app_handlers.go b/backend/controllers/app_handlers.go index 4b9014c0..0c8fb5a9 100644 --- a/backend/controllers/app_handlers.go +++ b/backend/controllers/app_handlers.go @@ -4,7 +4,6 @@ import ( "ccsync_backend/utils" "context" "encoding/json" - "log" "net/http" "os" @@ -45,7 +44,7 @@ func (a *App) OAuthHandler(w http.ResponseWriter, r *http.Request) { // @Failure 500 {string} string "Internal server error" // @Router /auth/callback [get] func (a *App) OAuthCallbackHandler(w http.ResponseWriter, r *http.Request) { - log.Println("Fetching user info...") + utils.Logger.Info("Fetching user info...") code := r.URL.Query().Get("code") @@ -87,7 +86,7 @@ func (a *App) OAuthCallbackHandler(w http.ResponseWriter, r *http.Request) { return } - log.Printf("User Info: %v", userInfo) + utils.Logger.Infof("User Info: %v", userInfo) frontendOriginDev := os.Getenv("FRONTEND_ORIGIN_DEV") http.Redirect(w, r, frontendOriginDev+"/home", http.StatusSeeOther) @@ -110,7 +109,7 @@ func (a *App) UserInfoHandler(w http.ResponseWriter, r *http.Request) { return } - log.Printf("Sending User Info: %v", userInfo) + utils.Logger.Infof("Sending User Info: %v", userInfo) w.Header().Set("Content-Type", "application/json") json.NewEncoder(w).Encode(userInfo) } @@ -148,5 +147,5 @@ func (a *App) LogoutHandler(w http.ResponseWriter, r *http.Request) { } w.WriteHeader(http.StatusOK) - log.Print("User has logged out") + utils.Logger.Info("User has logged out") } diff --git a/backend/controllers/job_queue.go b/backend/controllers/job_queue.go index b2bdae55..6672edba 100644 --- a/backend/controllers/job_queue.go +++ b/backend/controllers/job_queue.go @@ -1,9 +1,9 @@ package controllers import ( - "fmt" - "log" "sync" + + "ccsync_backend/utils" ) type Job struct { @@ -37,7 +37,7 @@ func (q *JobQueue) AddJob(job Job) { func (q *JobQueue) processJobs() { for job := range q.jobChannel { - fmt.Printf("Executing job: %s\n", job.Name) + utils.Logger.Infof("Executing job: %s", job.Name) go BroadcastJobStatus(JobStatus{ Job: job.Name, @@ -45,14 +45,14 @@ func (q *JobQueue) processJobs() { }) if err := job.Execute(); err != nil { - log.Printf("Error executing job %s: %v\n", job.Name, err) + utils.Logger.Errorf("Error executing job %s: %v", job.Name, err) go BroadcastJobStatus(JobStatus{ Job: job.Name, Status: "failure", }) } else { - log.Printf("Success in executing job %s\n", job.Name) + utils.Logger.Infof("Success in executing job %s", job.Name) go BroadcastJobStatus(JobStatus{ Job: job.Name, diff --git a/backend/controllers/websocket.go b/backend/controllers/websocket.go index f5c8430f..c2df6e31 100644 --- a/backend/controllers/websocket.go +++ b/backend/controllers/websocket.go @@ -1,9 +1,10 @@ package controllers import ( - "log" "net/http" + "ccsync_backend/utils" + "github.com/gorilla/websocket" ) @@ -24,37 +25,37 @@ var broadcast = make(chan JobStatus) func WebSocketHandler(w http.ResponseWriter, r *http.Request) { ws, err := upgrader.Upgrade(w, r, nil) if err != nil { - log.Println("WebSocket Upgrade Error:", err) + utils.Logger.Error("WebSocket Upgrade Error:", err) return } defer ws.Close() clients[ws] = true - log.Println("New WebSocket connection established!") + utils.Logger.Info("New WebSocket connection established!") for { _, _, err := ws.ReadMessage() if err != nil { delete(clients, ws) - log.Println("WebSocket connection closed:", err) + utils.Logger.Info("WebSocket connection closed:", err) break } } } func BroadcastJobStatus(jobStatus JobStatus) { - log.Printf("Broadcasting: %+v\n", jobStatus) + utils.Logger.Infof("Broadcasting: %+v", jobStatus) broadcast <- jobStatus } func JobStatusManager() { for { jobStatus := <-broadcast - log.Printf("Sending to clients: %+v\n", jobStatus) + utils.Logger.Infof("Sending to clients: %+v", jobStatus) for client := range clients { err := client.WriteJSON(jobStatus) if err != nil { - log.Printf("WebSocket Write Error: %v\n", err) + utils.Logger.Errorf("WebSocket Write Error: %v", err) client.Close() delete(clients, client) } diff --git a/backend/go.mod b/backend/go.mod index 2359d70c..b7c46d67 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -3,6 +3,7 @@ module ccsync_backend go 1.19 require ( + github.com/charmbracelet/log v0.4.2 github.com/gorilla/sessions v1.2.2 github.com/swaggo/http-swagger v1.3.4 github.com/swaggo/swag v1.16.3 @@ -11,19 +12,33 @@ require ( require ( github.com/KyleBanks/depth v1.2.1 // indirect + github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect + github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect + github.com/charmbracelet/lipgloss v1.1.0 // indirect + github.com/charmbracelet/x/ansi v0.8.0 // indirect + github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect + github.com/charmbracelet/x/term v0.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.20.0 // indirect github.com/go-openapi/spec v0.20.6 // indirect github.com/go-openapi/swag v0.19.15 // indirect github.com/gorilla/securecookie v1.1.2 // indirect github.com/josharian/intern v1.0.0 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/mailru/easyjson v0.7.6 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.16 // indirect + github.com/muesli/termenv v0.16.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rivo/uniseg v0.4.7 // indirect github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe // indirect + github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect + golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/tools v0.7.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/tools v0.14.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) @@ -33,5 +48,5 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 github.com/joho/godotenv v1.5.1 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 ) diff --git a/backend/go.sum b/backend/go.sum index 26c3a8f3..4c5bb360 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -2,10 +2,26 @@ cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2Qx cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= +github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= +github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= +github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs= +github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk= +github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= +github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= +github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig= +github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw= +github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE= +github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q= +github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8= +github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= +github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= +github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= +github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -35,26 +51,41 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= +github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= +github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe h1:K8pHPVoTgxFJt1lXuIzzOX7zZhZFldJQK/CgKx9BFIc= github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w= github.com/swaggo/http-swagger v1.3.4 h1:q7t/XLx0n15H1Q9/tk3Y9L4n210XzJF5WtnDX64a5ww= github.com/swaggo/http-swagger v1.3.4/go.mod h1:9dAh0unqMBAlbp1uE2Uc2mQTxNMU/ha4UbucIg1MFkQ= github.com/swaggo/swag v1.16.3 h1:PnCYjPCah8FK4I26l2F/KQ4yz3sILcVUN3cTlBFA9Pg= github.com/swaggo/swag v1.16.3/go.mod h1:DImHIuOFXKpMFAQjcC7FG4m3Dg4+QuUgUzJmKjI/gRk= -golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= +github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= +github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= +golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= @@ -62,13 +93,14 @@ golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo= golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= -golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= +golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= diff --git a/backend/main.go b/backend/main.go index 298f5193..85404308 100644 --- a/backend/main.go +++ b/backend/main.go @@ -2,11 +2,12 @@ package main import ( "encoding/gob" - "log" "net/http" "os" "time" + "ccsync_backend/utils" + "github.com/gorilla/sessions" "github.com/joho/godotenv" "golang.org/x/oauth2" @@ -46,9 +47,9 @@ import ( func main() { if os.Getenv("ENV") != "production" { _ = godotenv.Load() - log.Println("Loaded") + utils.Logger.Info("Loaded") } else { - log.Println("Continue") + utils.Logger.Info("Continue") } controllers.GlobalJobQueue = controllers.NewJobQueue() @@ -69,7 +70,7 @@ func main() { // Create a session store sessionKey := []byte(os.Getenv("SESSION_KEY")) if len(sessionKey) == 0 { - log.Fatal("SESSION_KEY environment variable is not set or empty") + utils.Logger.Fatal("SESSION_KEY environment variable is not set or empty") } store := sessions.NewCookieStore(sessionKey) gob.Register(map[string]interface{}{}) @@ -99,9 +100,9 @@ func main() { mux.HandleFunc("/api/docs/", httpSwagger.WrapHandler) go controllers.JobStatusManager() - log.Println("Server started at :8000") - log.Println("API documentation available at http://localhost:8000/api/docs/index.html") + utils.Logger.Info("Server started at :8000") + utils.Logger.Info("API documentation available at http://localhost:8000/api/docs/index.html") if err := http.ListenAndServe(":8000", app.EnableCORS(mux)); err != nil { - log.Fatal(err) + utils.Logger.Fatal(err) } } diff --git a/backend/models/logs.go b/backend/models/logs.go index 21b58e93..4fb5f73a 100644 --- a/backend/models/logs.go +++ b/backend/models/logs.go @@ -3,6 +3,8 @@ package models import ( "sync" "time" + + "ccsync_backend/utils" ) // LogEntry represents a single log entry for sync operations @@ -51,6 +53,18 @@ func (ls *LogStore) AddLog(level, message, syncID, operation string) { Operation: operation, } + // Also log to the structured logger + switch level { + case "INFO": + utils.Logger.Infof(message) + case "WARN": + utils.Logger.Warnf(message) + case "ERROR": + utils.Logger.Errorf(message) + default: + utils.Logger.Infof(message) + } + // Add to the end ls.entries = append(ls.entries, entry) diff --git a/backend/utils/logger.go b/backend/utils/logger.go new file mode 100644 index 00000000..270cc246 --- /dev/null +++ b/backend/utils/logger.go @@ -0,0 +1,26 @@ +package utils + +import ( + "os" + + "github.com/charmbracelet/log" +) + +var Logger *log.Logger + +func init() { + logLevelStr := os.Getenv("LOG_LEVEL") + logLevel := log.InfoLevel + if logLevelStr != "" { + parsedLevel, err := log.ParseLevel(logLevelStr) + if err == nil { + logLevel = parsedLevel + } + } + + Logger = log.NewWithOptions(os.Stderr, log.Options{ + ReportTimestamp: true, + TimeFormat: "2006-01-02 15:04:05", + Level: logLevel, + }) +}