commit be9bb87e0f972cf175bf33e28f4f597748368739 from: Witcher01 date: Tue Jun 8 14:09:46 2021 UTC added a bit of logging commit - 11b2252b2a8121dd503dc466923300da275dc4dc commit + be9bb87e0f972cf175bf33e28f4f597748368739 blob - 3368b191f2b0725632c172ba72389338399d7453 blob + 8c5b20c35dd8cb084a4a50fa08cd57b36b2a36e2 --- args.go +++ args.go @@ -4,6 +4,7 @@ import ( "os" "github.com/mkideal/cli" + log "github.com/sirupsen/logrus" ) type argT struct { @@ -24,6 +25,7 @@ func parseArgs(args []string) { }) if ret != 0 || ParsedArgs.Helper.Help { + log.Fatal("Parsing commandline arguments failed, aborting") os.Exit(ret) } } blob - 249cd2d098251051c496caa89018cc4372e99f7f blob + 508be2a4bb7b83e3cddddffc3d68d9fe2e1cf0a0 --- discord.go +++ discord.go @@ -4,6 +4,7 @@ import ( "fmt" "strings" + log "github.com/sirupsen/logrus" "github.com/bwmarrin/discordgo" "github.com/lus/dgc" ) @@ -69,10 +70,12 @@ func addDistrict(ctx *dgc.Ctx) { name, err := AddTrackedDistrict(arg.Raw()) if err != nil { + log.Error(err.Error()) ctx.RespondText(err.Error()) return } + log.Infof("Added district %s to trackedDistricts", name) ctx.RespondText(fmt.Sprintf("Added district %s.\n", name)) } @@ -82,16 +85,19 @@ func removeDistrict(ctx *dgc.Ctx) { name, err := RemoveTrackedDistrict(arg.Raw()) if err != nil { + log.Error(err.Error()) ctx.RespondText(err.Error()) return } + log.Infof("Removed district %s from trackedDistricts", name) ctx.RespondText(fmt.Sprintf("Removed district %s.\n", name)) } func getTrackedDistricts(ctx *dgc.Ctx) { districts, err := GetTrackedDistricts() if err != nil { + log.Error(err.Error()) ctx.RespondText(err.Error()) return } @@ -112,6 +118,7 @@ func getTrackedDistricts(ctx *dgc.Ctx) { func getTrackedIncidences(ctx *dgc.Ctx) { districts, err := GetTrackedDistricts() if err != nil { + log.Error(err.Error()) ctx.RespondText(err.Error()) return } @@ -135,6 +142,7 @@ func getDistrictInformation(ctx *dgc.Ctx) { district, err := GetDistrict(arg.Raw()) if err != nil { + log.Error(err.Error()) ctx.RespondText(err.Error()) return } blob - 8b265234699411a7a31d14716181f2d35db4d915 blob + 442f4d547156139408ae7d909c42578f192b4bed --- go.mod +++ go.mod @@ -4,8 +4,10 @@ go 1.16 require ( github.com/bwmarrin/discordgo v0.23.2 - github.com/go-co-op/gocron v1.6.0 github.com/lus/dgc v1.1.0 github.com/mkideal/cli v0.2.5 + github.com/sirupsen/logrus v1.8.1 + github.com/stretchr/testify v1.7.0 // indirect golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) blob - 32e64a3c8bec4fcb086a699704fa2b9fe09e6c6d blob + 9b0014ba8cc085cbd809d84a6f931fcd2a395b49 --- go.sum +++ go.sum @@ -5,8 +5,6 @@ github.com/comail/colog v0.0.0-20160416085026-fba8e7b1 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-co-op/gocron v1.6.0 h1:fWR5J6H+MX8FHkWDpSqJJo//Uh8PKXIFmOuGw/V3gys= -github.com/go-co-op/gocron v1.6.0/go.mod h1:DbJm9kdgr1sEvWpHCA7dFFs/PGHPMil9/97EXCRPr4k= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/karrick/tparse/v2 v2.8.1 h1:KmuwSutle9SVDQceHWr1IixyMZ0RSctDP/OB+OhqMNs= @@ -31,9 +29,10 @@ github.com/mkideal/expr v0.1.0 h1:fzborV9TeSUmLm0aEQWT github.com/mkideal/expr v0.1.0/go.mod h1:vL1DsSb87ZtU6IEjOtUfxw98z0FQbzS8xlGtnPkKdzg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= -github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -46,8 +45,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= blob - a37c60e0edec107546da28c89fd58d51eb6af9b8 blob + 3b396e3a4b149ae0d0be0d7aa64fb6c1005ccc54 --- main.go +++ main.go @@ -1,11 +1,11 @@ package main import ( - "fmt" "os" "os/signal" "syscall" + log "github.com/sirupsen/logrus" "github.com/bwmarrin/discordgo" ) @@ -23,8 +23,7 @@ func main() { // Cleanly close down the Discord session on program end defer discord.Close() if err != nil { - fmt.Println("error creating bot:", err) - return + log.Fatalf("error creating bot: %v", err) } InitDiscordBot(discord) @@ -32,13 +31,13 @@ func main() { err = discord.Open() if err != nil { - fmt.Println("error opening connection,", err) - return + log.Fatalf("error opening connection: %v", err) } // Wait here until CTRL-C or other term signal is received - fmt.Println("Bot is now running. Press CTRL-C to exit.") + log.Info("Bot running") sc := make(chan os.Signal, 1) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) <-sc + log.Info("Shutting down") }