From 15fe975b7bf18c7b036ebd7c13eb0994ed2daf8c Mon Sep 17 00:00:00 2001 From: Matthew R Kasun Date: Thu, 14 Dec 2023 09:17:57 -0500 Subject: [PATCH] clean up logging Signed-off-by: Matthew R Kasun --- main.go | 2 +- page.go | 3 +-- projects.go | 3 --- reports.go | 2 -- router.go | 3 +-- users.go | 2 +- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/main.go b/main.go index ee7e5b6..4a23c46 100644 --- a/main.go +++ b/main.go @@ -49,7 +49,7 @@ func main() { checkDefaultUser() users, err := database.GetAllUsers() if err != nil { - slog.Error("get users", "error", err) + log.Fatal("get users", err) } for _, user := range users { project := database.GetActiveProject(user.Username) diff --git a/page.go b/page.go index 8da3f86..8a6b261 100644 --- a/page.go +++ b/page.go @@ -16,7 +16,7 @@ func displayMain(c *gin.Context) { session := sessions.Default(c) user := session.Get("user") loggedIn := session.Get("loggedin") - slog.Info("displaying status for", "user", user, "loggedIn", loggedIn) + slog.Debug("displaying status for", "user", user, "loggedIn", loggedIn) if user == nil { page = populatePage("") } else { @@ -24,7 +24,6 @@ func displayMain(c *gin.Context) { } if loggedIn == nil { page.NeedsLogin = true - slog.Info("setting needs login", "needsLogin", page.NeedsLogin) } slog.Debug("displaystatus", "page", page.NeedsLogin, "refresh", page.Refresh) c.HTML(http.StatusOK, "layout", page) diff --git a/projects.go b/projects.go index 6049fe4..aad9b54 100644 --- a/projects.go +++ b/projects.go @@ -33,7 +33,6 @@ func addProject(c *gin.Context) { processError(c, http.StatusBadRequest, "could not decode request into json "+err.Error()) return } - slog.Info("addproject1", "project", project) if regexp.MustCompile(`\s+`).MatchString(project.Name) || project.Name == "" { processError(c, http.StatusBadRequest, "invalid project name") return @@ -50,12 +49,10 @@ func addProject(c *gin.Context) { project.ID = uuid.New() project.Active = true project.Updated = time.Now() - slog.Info("add project", "project", project) if err := database.SaveProject(&project); err != nil { processError(c, http.StatusInternalServerError, "error saving project "+err.Error()) return } - slog.Info("added", "project", project.Name) displayMain(c) } diff --git a/reports.go b/reports.go index 4ab4469..ab033a4 100644 --- a/reports.go +++ b/reports.go @@ -29,8 +29,6 @@ func getReport(c *gin.Context) { } return } - slog.Info("reportRequest", "request", reportRequest) - dbRequest.Start, err = time.Parse("2006-01-02", reportRequest.Start) if err != nil { processError(c, http.StatusInternalServerError, err.Error()) diff --git a/router.go b/router.go index 65ba824..e7df193 100644 --- a/router.go +++ b/router.go @@ -92,7 +92,7 @@ func auth(c *gin.Context) { session := sessions.Default(c) loggedIn := session.Get("loggedin") if loggedIn == nil { - slog.Info("not logged in -- redirect to /") + slog.Info("not logged in display login page") page := models.GetPage() page.NeedsLogin = true c.HTML(http.StatusOK, "login", page) @@ -104,7 +104,6 @@ func auth(c *gin.Context) { func checkDefaultUser() { user := os.Getenv("USER") pass := os.Getenv("PASS") - slog.Info("user from env", "user", user, "pass", pass) users, err := database.GetAllUsers() if err != nil { log.Fatal(err) diff --git a/users.go b/users.go index 3b84eeb..228746a 100644 --- a/users.go +++ b/users.go @@ -43,7 +43,7 @@ func login(c *gin.Context) { session.Options(sessions.Options{MaxAge: SessionAge, Secure: false, SameSite: http.SameSiteLaxMode}) _ = session.Save() user.Password = "" - slog.Info("login", "user", user.Username) + slog.Debug("login", "user", user.Username) page := populatePage(user.Username) page.NeedsLogin = false projects, err := database.GetAllProjects()