diff --git a/.gitignore b/.gitignore index 8a9aebb..ae883a5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ test-db.sqlite* node_modules/ styles.css mmaschedule +mmaschedule.log diff --git a/src/main.go b/src/main.go index 18e3e1d..c7dc4e4 100644 --- a/src/main.go +++ b/src/main.go @@ -19,9 +19,6 @@ import ( //go:embed migrations/*.sql var migrations embed.FS -var host = flag.String("host", "127.0.0.1:8000", "Set the web server host address.") -var debug = flag.Bool("debug", false, "Enable debug mode.") - const POSITIONAL_ARGS_HELP = ` Valid commands: runserver: Runs the web server. @@ -29,6 +26,9 @@ Valid commands: ` func main() { + var host = flag.String("host", "127.0.0.1:8000", "Set the web server host address.") + var debug = flag.Bool("debug", false, "Enable debug mode.") + flag.Parse() if len(flag.Args()) == 0 { @@ -39,12 +39,12 @@ func main() { if *debug { slog.SetLogLoggerLevel(slog.LevelDebug) } else { - slog.SetLogLoggerLevel(slog.LevelInfo) + slog.SetLogLoggerLevel(slog.LevelInfo) } f, err := os.OpenFile("mmaschedule.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666) if err != nil { - fmt.Println("Error opening file:", err) + fmt.Println("Failed opening log file", err) os.Exit(1) } @@ -56,7 +56,7 @@ func main() { client := NewScraperClient() queries, err := InitDb("db.sqlite") if err != nil { - slog.Error("Error initializing database", "error", err) + slog.Error("Failed initializing database", "error", err) return } diff --git a/src/orchestrator.go b/src/orchestrator.go index 96b1aef..4805dec 100644 --- a/src/orchestrator.go +++ b/src/orchestrator.go @@ -37,7 +37,7 @@ func ScrapeEvents(q *event.Queries, client ClientScraper, tapology bool) { if len(events) > 0 { err := q.UpsertEvents(context.Background(), events) if err != nil { - slog.Error("Error updating events in database:", "error", err) + slog.Error("Failed updating events in database", "error", err) } } } @@ -45,7 +45,7 @@ func ScrapeEvents(q *event.Queries, client ClientScraper, tapology bool) { func UpdateTapology(q *event.Queries, client ClientScraper, events *[]*event.Event) { err := SetTapologyCSRF(client) if err != nil { - slog.Error("Error settings tapology CSRF:", "error", err) + slog.Error("Failed settings tapology CSRF", "error", err) } for _, e := range *events { @@ -59,14 +59,14 @@ func UpdateTapology(q *event.Queries, client ClientScraper, events *[]*event.Eve slog.Debug("Getting tapology link", "name", ff.Name) tapology, err := q.GetTapology(context.Background(), ff.Name) if err != nil { - slog.Error("Error getting tapology from database", "error", err) + slog.Error("Failed getting tapology from database", "name", ff.Name, "error", err) link, err := GetTapologyLink(client, ff.Name) if err != nil { - slog.Error("Error getting tapology from site", "error", err) + slog.Error("Failed getting tapology from site", "name", ff.Name, "error", err) } else if len(link) > 0 { err := q.CreateTapology(context.Background(), event.CreateTapologyParams{Name: ff.Name, Url: link}) if err != nil { - slog.Error("Error creating tapology in database", "error", err) + slog.Error("Failed creating tapology in database", "name", ff.Name, "error", err) } ff.Link = link }