diff --git a/main.go b/main.go index 95a5ffa..94cb502 100644 --- a/main.go +++ b/main.go @@ -10,9 +10,9 @@ import ( "github.com/MedzikUser/go-utils/common" "github.com/MedzikUser/go-utils/updater" "github.com/jpillora/opts" - "gitlab.com/gaming0skar123/go/pingbot/backend" "gitlab.com/gaming0skar123/go/pingbot/config" "gitlab.com/gaming0skar123/go/pingbot/database/mongo" + "gitlab.com/gaming0skar123/go/pingbot/ping" "gitlab.com/gaming0skar123/go/pingbot/website" ) @@ -124,7 +124,7 @@ func main() { } if config.Toml.Options.Stop_After_Ping { - backend.StopAfterPing() + ping.StopAfterPing() os.Exit(0) } @@ -138,7 +138,7 @@ func main() { if config.Toml.Backend.Enabled { wg.Add(1) - go backend.Ticker() + go ping.Ticker() } else { log.Warn("Backend -> Disabled") } diff --git a/backend/cache.go b/ping/cache.go similarity index 96% rename from backend/cache.go rename to ping/cache.go index c254cc2..4f95649 100644 --- a/backend/cache.go +++ b/ping/cache.go @@ -1,4 +1,4 @@ -package backend +package ping import ( "time" diff --git a/backend/ping.go b/ping/ping.go similarity index 97% rename from backend/ping.go rename to ping/ping.go index 01a6ed9..da6ea05 100644 --- a/backend/ping.go +++ b/ping/ping.go @@ -1,4 +1,4 @@ -package backend +package ping import ( "context" diff --git a/backend/status.go b/ping/status.go similarity index 83% rename from backend/status.go rename to ping/status.go index 00022ad..a8507d6 100644 --- a/backend/status.go +++ b/ping/status.go @@ -1,4 +1,4 @@ -package backend +package ping var Status StatusType diff --git a/backend/stopAfterPing.go b/ping/stopAfterPing.go similarity index 97% rename from backend/stopAfterPing.go rename to ping/stopAfterPing.go index 4d14378..1317e8a 100644 --- a/backend/stopAfterPing.go +++ b/ping/stopAfterPing.go @@ -1,4 +1,4 @@ -package backend +package ping import ( "os" diff --git a/backend/ticker.go b/ping/ticker.go similarity index 95% rename from backend/ticker.go rename to ping/ticker.go index 131ba00..6051c85 100644 --- a/backend/ticker.go +++ b/ping/ticker.go @@ -1,4 +1,4 @@ -package backend +package ping import ( "time" diff --git a/pre-commit.sh b/pre-commit.sh new file mode 100755 index 0000000..1f62b99 --- /dev/null +++ b/pre-commit.sh @@ -0,0 +1,6 @@ +#!/usr/bin/bash + +go mod tidy + +# Lint +go fmt ./... diff --git a/schema.env b/schema.env index 764d797..3907596 100644 --- a/schema.env +++ b/schema.env @@ -1,5 +1,5 @@ # MongoDB -MONGODB_URI=mongodb+srv://... +MONGO_URI=mongodb+srv://... # GitHub GH_TOKEN=ghp_ diff --git a/website/routes/api/getAll.go b/website/routes/api/getAll.go index cc6672e..356f7cb 100644 --- a/website/routes/api/getAll.go +++ b/website/routes/api/getAll.go @@ -4,14 +4,14 @@ import ( "net/http" "github.com/gin-gonic/gin" - "gitlab.com/gaming0skar123/go/pingbot/backend" + "gitlab.com/gaming0skar123/go/pingbot/ping" ) func GetAll(c *gin.Context) { - backend.Cache() + ping.Cache() c.JSON(http.StatusOK, json{ "success": true, - "db": backend.CacheURL, + "db": ping.CacheURL, }) } diff --git a/website/routes/api/status.go b/website/routes/api/status.go index 03a3714..d7d39ed 100644 --- a/website/routes/api/status.go +++ b/website/routes/api/status.go @@ -7,8 +7,8 @@ import ( "github.com/MedzikUser/go-utils/common" "github.com/MedzikUser/go-utils/stats" "github.com/gin-gonic/gin" - "gitlab.com/gaming0skar123/go/pingbot/backend" "gitlab.com/gaming0skar123/go/pingbot/config" + "gitlab.com/gaming0skar123/go/pingbot/ping" ) func Status(c *gin.Context) { @@ -19,20 +19,20 @@ func Status(c *gin.Context) { cpu, err := stats.CPU() common.CheckErr(err, "cpu stat") - var ping json + var p json if config.Toml.Backend.Enabled { - ping = json{ - "all": backend.Status.Error + backend.Status.Success, - "success": backend.Status.Success, - "err": backend.Status.Error, + p = json{ + "all": ping.Status.Error + ping.Status.Success, + "success": ping.Status.Success, + "err": ping.Status.Error, } } else { - ping = nil + p = nil } c.JSON(http.StatusOK, json{ - "ping": ping, + "ping": p, "sys": json{ "pid": cpu.PID, "os": runtime.GOOS,