From 44d5e533f3cd6a01671697ffc67ffc659ee59c3a Mon Sep 17 00:00:00 2001 From: Xevion Date: Tue, 26 Dec 2023 08:07:09 -0600 Subject: [PATCH] Fix CentralTime init order (again) --- main.go | 8 ++++++++ term.go | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/main.go b/main.go index b11f461..14acc9d 100644 --- a/main.go +++ b/main.go @@ -8,6 +8,7 @@ import ( "os/signal" "syscall" "time" + _ "time/tzdata" "github.com/bwmarrin/discordgo" "github.com/joho/godotenv" @@ -26,11 +27,18 @@ var ( isDevelopment bool baseURL string // Base URL for all requests to the banner system environment string + CentralTime *time.Location ) func init() { ctx = context.Background() + var err error + CentralTime, err = time.LoadLocation("America/Chicago") + if err != nil { + panic(err) + } + // Set zerolog's timestamp function to use the central timezone zerolog.TimestampFunc = func() time.Time { return time.Now().In(CentralTime) diff --git a/term.go b/term.go index 9435d9d..382365a 100644 --- a/term.go +++ b/term.go @@ -4,7 +4,6 @@ import ( "fmt" "strconv" "time" - _ "time/tzdata" "github.com/rs/zerolog/log" ) @@ -27,16 +26,9 @@ type Term struct { var ( SpringRange, SummerRange, FallRange YearDayRange - CentralTime *time.Location ) func init() { - var err error - CentralTime, err = time.LoadLocation("America/Chicago") - if err != nil { - panic(err) - } - SpringRange, SummerRange, FallRange = GetYearDayRange(uint16(time.Now().Year())) currentTerm, nextTerm := GetCurrentTerm(time.Now())