diff --git a/internal/bootstrap/app_bootstrap.go b/internal/bootstrap/app_bootstrap.go index 7c5ae8c..f717b7b 100644 --- a/internal/bootstrap/app_bootstrap.go +++ b/internal/bootstrap/app_bootstrap.go @@ -375,7 +375,7 @@ func (app *BootstrapApp) dbCleanup(db *gorm.DB) { for ; true; <-ticker.C { log.Debug().Msg("Cleaning up old database sessions") - _, err := gorm.G[model.Session](db).Where("expiry < ?", time.Now().UnixMilli()).Delete(ctx) + _, err := gorm.G[model.Session](db).Where("expiry < ?", time.Now().Unix()).Delete(ctx) if err != nil { log.Error().Err(err).Msg("Failed to cleanup old sessions") } diff --git a/internal/service/auth_service.go b/internal/service/auth_service.go index a75bb04..bcba481 100644 --- a/internal/service/auth_service.go +++ b/internal/service/auth_service.go @@ -266,9 +266,9 @@ func (auth *AuthService) GetSessionCookie(c *gin.Context) (config.SessionCookie, currentTime := time.Now().Unix() if currentTime > session.Expiry { - res := auth.database.Unscoped().Where("uuid = ?", session.UUID).Delete(&model.Session{}) - if res.Error != nil { - log.Error().Err(res.Error).Msg("Failed to delete expired session") + _, err = gorm.G[model.Session](auth.database).Where("uuid = ?", cookie).Delete(auth.ctx) + if err != nil { + log.Error().Err(err).Msg("Failed to delete expired session") } return config.SessionCookie{}, fmt.Errorf("session expired") } diff --git a/main.go b/main.go index 893e62f..94aefe2 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ import ( ) func main() { - log.Logger = log.Logger.With().Timestamp().Caller().Logger() + log.Logger = log.Logger.With().Caller().Logger() if !utils.ShoudLogJSON(os.Environ(), os.Args) { log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}) }