From e7894959fc839c497c2d93381c55edb1af6a662a Mon Sep 17 00:00:00 2001 From: Medzik <87065584+MedzikUser@users.noreply.github.com> Date: Thu, 12 Aug 2021 19:26:54 +0000 Subject: [PATCH] chore: add go-utils --- backend/ping.go | 2 +- common/checkErr.go | 13 ------------- common/log.go | 14 -------------- config/toml.go | 2 +- database/mongo/connect.go | 2 +- go.mod | 2 +- go.sum | 2 ++ main.go | 2 +- update/update.go | 2 +- website/routes/api/status.go | 2 +- website/server.go | 2 +- 11 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 common/checkErr.go delete mode 100644 common/log.go diff --git a/backend/ping.go b/backend/ping.go index 9793710..8d4f9a7 100644 --- a/backend/ping.go +++ b/backend/ping.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "gitlab.com/gaming0skar123/go/pingbot/common" + "github.com/MedzikUser/go-utils/common" "gitlab.com/gaming0skar123/go/pingbot/config" ) diff --git a/common/checkErr.go b/common/checkErr.go deleted file mode 100644 index 85e1dca..0000000 --- a/common/checkErr.go +++ /dev/null @@ -1,13 +0,0 @@ -package common - -import "github.com/sirupsen/logrus" - -func CheckErr(err error, trace string) bool { - if err != nil { - Log.WithFields(logrus.Fields{ - "trace": trace, - }).Error(err) - } - - return err != nil -} diff --git a/common/log.go b/common/log.go deleted file mode 100644 index 12b4e92..0000000 --- a/common/log.go +++ /dev/null @@ -1,14 +0,0 @@ -package common - -import ( - "os" - - "github.com/sirupsen/logrus" -) - -var Log = &logrus.Logger{ - Out: os.Stdout, - Formatter: new(logrus.TextFormatter), - Hooks: make(logrus.LevelHooks), - Level: logrus.InfoLevel, -} diff --git a/config/toml.go b/config/toml.go index a02bf7c..2d86f5a 100644 --- a/config/toml.go +++ b/config/toml.go @@ -7,7 +7,7 @@ import ( "time" "github.com/BurntSushi/toml" - "gitlab.com/gaming0skar123/go/pingbot/common" + "github.com/MedzikUser/go-utils/common" ) type tomlConfig struct { diff --git a/database/mongo/connect.go b/database/mongo/connect.go index 96fc772..a887d47 100644 --- a/database/mongo/connect.go +++ b/database/mongo/connect.go @@ -5,7 +5,7 @@ import ( "os" "time" - "gitlab.com/gaming0skar123/go/pingbot/common" + "github.com/MedzikUser/go-utils/common" "gitlab.com/gaming0skar123/go/pingbot/config" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/go.mod b/go.mod index 9f2dfa7..5726a98 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.16 require ( github.com/BurntSushi/toml v0.4.1 github.com/MedzikUser/go-github-selfupdate v1.3.1 + github.com/MedzikUser/go-utils v0.0.0 github.com/blang/semver/v4 v4.0.0 github.com/gin-contrib/cors v1.3.1 github.com/gin-gonic/gin v1.7.3 @@ -20,7 +21,6 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.1 // indirect github.com/onsi/gomega v1.10.5 // indirect - github.com/sirupsen/logrus v1.8.1 github.com/struCoder/pidusage v0.2.0 github.com/ugorji/go v1.2.6 // indirect github.com/ulikunitz/xz v0.5.10 // indirect diff --git a/go.sum b/go.sum index 3f2593b..96aac0f 100644 --- a/go.sum +++ b/go.sum @@ -37,6 +37,8 @@ github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/MedzikUser/go-github-selfupdate v1.3.1 h1:PlLrOMEucL8B2LNRUaceAgvu17J4x02NTcPa78ZMxl0= github.com/MedzikUser/go-github-selfupdate v1.3.1/go.mod h1:vq1/KNWXN7R/aKZFD5p2rsIdQ+2FSXnlIts1QHEZCM4= +github.com/MedzikUser/go-utils v0.0.0 h1:69tLs7g0vK7GEt0GXVTq8/eSmsnBLOzmomrGtdTvd+0= +github.com/MedzikUser/go-utils v0.0.0/go.mod h1:fRjF5g45iBpgaSylXWDxM1U++na14eJmmx5DwXz0vAE= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= diff --git a/main.go b/main.go index 2fc77bb..170bf9a 100644 --- a/main.go +++ b/main.go @@ -4,8 +4,8 @@ import ( "sync" "time" + "github.com/MedzikUser/go-utils/common" "gitlab.com/gaming0skar123/go/pingbot/backend" - "gitlab.com/gaming0skar123/go/pingbot/common" "gitlab.com/gaming0skar123/go/pingbot/config" "gitlab.com/gaming0skar123/go/pingbot/database/mongo" "gitlab.com/gaming0skar123/go/pingbot/update" diff --git a/update/update.go b/update/update.go index fb3d5b0..64710ff 100644 --- a/update/update.go +++ b/update/update.go @@ -4,8 +4,8 @@ import ( "os" "github.com/MedzikUser/go-github-selfupdate/selfupdate" + "github.com/MedzikUser/go-utils/common" "github.com/blang/semver/v4" - "gitlab.com/gaming0skar123/go/pingbot/common" "gitlab.com/gaming0skar123/go/pingbot/config" ) diff --git a/website/routes/api/status.go b/website/routes/api/status.go index 60ffc41..cf46763 100644 --- a/website/routes/api/status.go +++ b/website/routes/api/status.go @@ -9,10 +9,10 @@ import ( "strconv" "time" + "github.com/MedzikUser/go-utils/common" "github.com/gin-gonic/gin" "github.com/struCoder/pidusage" "gitlab.com/gaming0skar123/go/pingbot/backend" - "gitlab.com/gaming0skar123/go/pingbot/common" "gitlab.com/gaming0skar123/go/pingbot/config" ) diff --git a/website/server.go b/website/server.go index ace8804..a739c72 100644 --- a/website/server.go +++ b/website/server.go @@ -4,9 +4,9 @@ import ( "os" "strconv" + "github.com/MedzikUser/go-utils/common" "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" - "gitlab.com/gaming0skar123/go/pingbot/common" "gitlab.com/gaming0skar123/go/pingbot/config" "gitlab.com/gaming0skar123/go/pingbot/website/routes" "gitlab.com/gaming0skar123/go/pingbot/website/routes/api"