Skip to content

Commit

Permalink
clean up logging
Browse files Browse the repository at this point in the history
Signed-off-by: Matthew R Kasun <[email protected]>
  • Loading branch information
mattkasun committed Dec 14, 2023
1 parent 59b3e7c commit 15fe975
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions page.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,14 @@ 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 {
page = populatePage(user.(string))
}
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)
Expand Down
3 changes: 0 additions & 3 deletions projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
}

Expand Down
2 changes: 0 additions & 2 deletions reports.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
3 changes: 1 addition & 2 deletions router.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion users.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 15fe975

Please sign in to comment.