h/projectreshoot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added debug logging to run function

Browse Source
This commit is contained in:
Haelnorr
2025-02-18 20:05:41 +11:00
parent c0bbe687f9
commit 0ece08726d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
handlers/login.go
View File

@@ -3,7 +3,6 @@ package handlers
import ( import (
"context" "context"
"net/http" "net/http"
"time"
"projectreshoot/config" "projectreshoot/config"
"projectreshoot/cookies" "projectreshoot/cookies"

9
main.go
View File

@@ -48,14 +48,17 @@ func getStaticFiles(logger *zerolog.Logger) (http.FileSystem, error) {
var maint uint32 // atomic: 1 if in maintenance mode var maint uint32 // atomic: 1 if in maintenance mode
// Handle SIGUSR1 and SIGUSR2 syscalls to toggle maintenance mode
func handleMaintSignals( func handleMaintSignals(
conn *db.SafeConn, conn *db.SafeConn,
srv *http.Server, srv *http.Server,
logger *zerolog.Logger, logger *zerolog.Logger,
config *config.Config, config *config.Config,
) { ) {
logger.Debug().Msg("Starting signal listener")
ch := make(chan os.Signal, 1) ch := make(chan os.Signal, 1)
srv.RegisterOnShutdown(func() { srv.RegisterOnShutdown(func() {
logger.Debug().Msg("Shutting down signal listener")
close(ch) close(ch)
}) })
go func() { go func() {
@@ -117,17 +120,21 @@ func run(ctx context.Context, w io.Writer, args map[string]string) error {
return errors.Wrap(err, "logging.GetLogger") return errors.Wrap(err, "logging.GetLogger")
} }
logger.Debug().Msg("Config loaded and logger started")
logger.Debug().Msg("Connecting to database")
conn, err := db.ConnectToDatabase(config.DBName, logger) conn, err := db.ConnectToDatabase(config.DBName, logger)
if err != nil { if err != nil {
return errors.Wrap(err, "db.ConnectToDatabase") return errors.Wrap(err, "db.ConnectToDatabase")
} }
defer conn.Close() defer conn.Close()
logger.Debug().Msg("Getting static files")
staticFS, err := getStaticFiles(logger) staticFS, err := getStaticFiles(logger)
if err != nil { if err != nil {
return errors.Wrap(err, "getStaticFiles") return errors.Wrap(err, "getStaticFiles")
} }
logger.Debug().Msg("Setting up HTTP server")
srv := server.NewServer(config, logger, conn, &staticFS, &maint) srv := server.NewServer(config, logger, conn, &staticFS, &maint)
httpServer := &http.Server{ httpServer := &http.Server{
Addr: net.JoinHostPort(config.Host, config.Port), Addr: net.JoinHostPort(config.Host, config.Port),
@@ -139,6 +146,7 @@ func run(ctx context.Context, w io.Writer, args map[string]string) error {
// Runs function for testing in dev if --test flag true // Runs function for testing in dev if --test flag true
if args["test"] == "true" { if args["test"] == "true" {
logger.Debug().Msg("Running tester function")
test(config, logger, conn, httpServer) test(config, logger, conn, httpServer)
return nil return nil
} }
@@ -147,6 +155,7 @@ func run(ctx context.Context, w io.Writer, args map[string]string) error {
handleMaintSignals(conn, httpServer, logger, config) handleMaintSignals(conn, httpServer, logger, config)
// Runs the http server // Runs the http server
logger.Debug().Msg("Starting up the HTTP server")
go func() { go func() {
logger.Info().Str("address", httpServer.Addr).Msg("Listening for requests") logger.Info().Str("address", httpServer.Addr).Msg("Listening for requests")
if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed { if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {