From d13e47d3cebf1276e13d4f70517336f90ecdee2b Mon Sep 17 00:00:00 2001 From: Ash Keel Date: Thu, 9 Dec 2021 13:32:58 +0100 Subject: [PATCH] lint fixes --- main.go | 16 ++++++++++------ modules/http/server.go | 12 +++++++++++- modules/twitch/modules.timer.go | 3 +-- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/main.go b/main.go index ffc18d6..8a11800 100644 --- a/main.go +++ b/main.go @@ -25,8 +25,6 @@ import ( _ "net/http/pprof" ) -const AppTitle = "strimertül" - const AppHeader = ` _ _ _ O O _ __| |_ _ _(_)_ __ ___ _ _| |_ _ _| | @@ -35,8 +33,6 @@ const AppHeader = ` var appVersion = "v0.0.0-UNKNOWN" -const DefaultBind = "localhost:4337" - //go:embed frontend/dist/* var frontend embed.FS @@ -100,7 +96,11 @@ func main() { // Loading routine db, err := database.Open(badger.DefaultOptions(*dbdir), manager) failOnError(err, "Could not open DB") - defer db.Close() + defer func() { + if err := db.Close(); err != nil { + log.WithError(err).Error("Could not close DB") + } + }() if *cleanup { // Run DB garbage collection until it's done @@ -133,7 +133,11 @@ func main() { // Create logger and endpoints httpServer, err := http.NewServer(manager) failOnError(err, "Could not initialize http server") - defer httpServer.Close() + defer func() { + if err := httpServer.Close(); err != nil { + log.WithError(err).Error("Could not close DB") + } + }() fedir, _ := fs.Sub(frontend, "frontend/dist") httpServer.SetFrontend(fedir) diff --git a/modules/http/server.go b/modules/http/server.go index 05f54b5..8b63187 100644 --- a/modules/http/server.go +++ b/modules/http/server.go @@ -39,7 +39,17 @@ func NewServer(manager *modules.Manager) (*Server, error) { } err := db.GetJSON(ServerConfigKey, &server.Config) if err != nil { - return nil, err + // Initialize with default config + server.Config = ServerConfig{ + Bind: "localhost:4337", + EnableStaticServer: false, + KVPassword: "", + } + // Save + err = db.PutJSON(ServerConfigKey, server.Config) + if err != nil { + return nil, err + } } server.hub, err = kv.NewHub(db.Client(), kv.HubOptions{ diff --git a/modules/twitch/modules.timer.go b/modules/twitch/modules.timer.go index 1876de6..e40bc44 100644 --- a/modules/twitch/modules.timer.go +++ b/modules/twitch/modules.timer.go @@ -34,7 +34,6 @@ type BotTimerModule struct { lastTrigger map[string]time.Time bot *Bot messages [AverageMessageWindow]int - lastMinute int mu sync.Mutex startTime time.Time } @@ -106,7 +105,7 @@ func (m *BotTimerModule) runTimers() { defer m.mu.Unlock() for name, timer := range m.Config.Timers { // Must be enabled - if timer.Enabled != true { + if !timer.Enabled { continue } // Check if enough time has passed