From 41ecec808cd98ff8e1f3ef314a53f629b50784a5 Mon Sep 17 00:00:00 2001 From: Odyssey Date: Sat, 7 Jan 2023 17:54:04 +0100 Subject: [PATCH] Switch logger Signed-off-by: Odyssey --- go.mod | 2 +- go.sum | 5 +++++ main.go | 10 +++------- pages/signup.go | 15 ++++++--------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index e2c548c..d0f6602 100644 --- a/go.mod +++ b/go.mod @@ -13,11 +13,11 @@ require ( github.com/mattn/go-runewidth v0.0.14 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/sethvargo/go-password v0.2.0 // indirect + github.com/sirupsen/logrus v1.9.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.43.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.9.0 // indirect - go.uber.org/zap v1.24.0 // indirect golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect ) diff --git a/go.sum b/go.sum index 832e2f0..f3c8e63 100644 --- a/go.sum +++ b/go.sum @@ -120,6 +120,8 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/sethvargo/go-password v0.2.0 h1:BTDl4CC/gjf/axHMaDQtw507ogrXLci6XRiLc7i/UHI= github.com/sethvargo/go-password v0.2.0/go.mod h1:Ym4Mr9JXLBycr02MFuVQ/0JHidNetSgbzutTr3zsYXE= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -139,6 +141,7 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= @@ -197,6 +200,7 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -240,4 +244,5 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/main.go b/main.go index b56b8f3..7d42ccd 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,8 @@ import ( "github.com/ProjectSegfault/publapi/pages" "github.com/gofiber/fiber/v2" - "go.uber.org/zap" + + log "github.com/sirupsen/logrus" ) // publapi is a simple API for Project Segfault's public shared server (pubnix). @@ -21,15 +22,10 @@ func main() { }) app.Get("/online", func(c *fiber.Ctx) error { - - // set up logger - logger, _ := zap.NewProduction() - defer logger.Sync() - // Get the number of users online out, err := exec.Command("users | wc -l").Output() if err != nil { - logger.Error("failed to get number of users online", zap.Error(err)) + log.Error(err) return c.SendStatus(fiber.StatusInternalServerError) } diff --git a/pages/signup.go b/pages/signup.go index 5fdd755..671618e 100644 --- a/pages/signup.go +++ b/pages/signup.go @@ -10,33 +10,30 @@ import ( "github.com/containrrr/shoutrrr" - "go.uber.org/zap" + log "github.com/sirupsen/logrus" ) // SignupPage is the signup page handler func SignupPage(c *fiber.Ctx) error { - // set up logger - logger, _ := zap.NewProduction() - defer logger.Sync() username := c.FormValue("username") email := c.FormValue("email") if username == "" || email == "" { - logger.Error("username or email is empty", zap.String("username", username), zap.String("email", email)) + log.Error("Username or email is empty", username, email) return c.SendStatus(fiber.StatusBadRequest) } // generate password pass, err := password.Generate(30, 10, 10, false, false) if err != nil { - logger.Error("failed to generate password", zap.Error(err)) + log.Error("Error generating password", err) return c.SendStatus(fiber.StatusInternalServerError) } // create user file f, err := os.Create("/var/publapi/users/" + username + ".sh") if err != nil { - logger.Error("failed to create user file", zap.Error(err)) + log.Error("Error creating user file", err) return c.SendStatus(fiber.StatusInternalServerError) } defer f.Close() @@ -53,14 +50,14 @@ func SignupPage(c *fiber.Ctx) error { // write to file _, err = f.WriteString(bashscript) if err != nil { - logger.Error("failed to write to user file", zap.Error(err)) + log.Error("Error writing to user file", err) return c.SendStatus(fiber.StatusInternalServerError) } // send notification to admins err = shoutrrr.Send(os.Getenv("PUBLAPI_SHOUTRRRURL"), "New user signup! Please review /var/publapi/users/"+username+".sh to approve or deny the user.") if err != nil { - logger.Error("failed to send notification to admins", zap.Error(err)) + log.Error("Error sending notification to admins", err) return c.SendStatus(fiber.StatusInternalServerError) } return c.JSON(fiber.Map{