From ddb1d7c9d7f84a1edda52d2d71d942aa850c3faf Mon Sep 17 00:00:00 2001 From: Sky Johnson Date: Thu, 5 Jun 2025 20:26:09 -0500 Subject: [PATCH] move logger to top level --- http/server.go | 2 +- {utils/logger => logger}/logger.go | 0 moonshark.go | 2 +- runner/embed.go | 2 +- runner/lualibs/crypto.go | 2 +- runner/lualibs/env.go | 2 +- runner/lualibs/fs.go | 2 +- runner/moduleLoader.go | 2 +- runner/runner.go | 2 +- runner/sqlite/sqlite.go | 2 +- watchers/api.go | 2 +- watchers/dir.go | 2 +- watchers/manager.go | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename {utils/logger => logger}/logger.go (100%) diff --git a/http/server.go b/http/server.go index ec17eac..a371a4f 100644 --- a/http/server.go +++ b/http/server.go @@ -10,12 +10,12 @@ import ( "Moonshark/color" "Moonshark/config" + "Moonshark/logger" "Moonshark/metadata" "Moonshark/router" "Moonshark/runner" "Moonshark/sessions" "Moonshark/utils" - "Moonshark/utils/logger" "github.com/valyala/fasthttp" ) diff --git a/utils/logger/logger.go b/logger/logger.go similarity index 100% rename from utils/logger/logger.go rename to logger/logger.go diff --git a/moonshark.go b/moonshark.go index e7f1d38..feac7bb 100644 --- a/moonshark.go +++ b/moonshark.go @@ -16,12 +16,12 @@ import ( "Moonshark/color" "Moonshark/config" "Moonshark/http" + "Moonshark/logger" "Moonshark/metadata" "Moonshark/router" "Moonshark/runner" "Moonshark/runner/lualibs" "Moonshark/sessions" - "Moonshark/utils/logger" "Moonshark/watchers" fin "git.sharkk.net/Sharkk/Fin" diff --git a/runner/embed.go b/runner/embed.go index ea27ed9..dcafd2b 100644 --- a/runner/embed.go +++ b/runner/embed.go @@ -1,7 +1,7 @@ package runner import ( - "Moonshark/utils/logger" + "Moonshark/logger" _ "embed" luajit "git.sharkk.net/Sky/LuaJIT-to-Go" diff --git a/runner/lualibs/crypto.go b/runner/lualibs/crypto.go index 5c81e8b..aa858d6 100644 --- a/runner/lualibs/crypto.go +++ b/runner/lualibs/crypto.go @@ -1,7 +1,7 @@ package lualibs import ( - "Moonshark/utils/logger" + "Moonshark/logger" "crypto/hmac" "crypto/md5" "crypto/rand" diff --git a/runner/lualibs/env.go b/runner/lualibs/env.go index 22bda06..93bb26d 100644 --- a/runner/lualibs/env.go +++ b/runner/lualibs/env.go @@ -11,7 +11,7 @@ import ( "sync" "Moonshark/color" - "Moonshark/utils/logger" + "Moonshark/logger" luajit "git.sharkk.net/Sky/LuaJIT-to-Go" ) diff --git a/runner/lualibs/fs.go b/runner/lualibs/fs.go index d52acae..6c71ec8 100644 --- a/runner/lualibs/fs.go +++ b/runner/lualibs/fs.go @@ -9,7 +9,7 @@ import ( "time" "Moonshark/color" - "Moonshark/utils/logger" + "Moonshark/logger" lru "git.sharkk.net/Go/LRU" luajit "git.sharkk.net/Sky/LuaJIT-to-Go" diff --git a/runner/moduleLoader.go b/runner/moduleLoader.go index c228003..e806612 100644 --- a/runner/moduleLoader.go +++ b/runner/moduleLoader.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "Moonshark/utils/logger" + "Moonshark/logger" luajit "git.sharkk.net/Sky/LuaJIT-to-Go" ) diff --git a/runner/runner.go b/runner/runner.go index 74d10b0..5d6a83a 100644 --- a/runner/runner.go +++ b/runner/runner.go @@ -11,11 +11,11 @@ import ( "sync/atomic" "time" + "Moonshark/logger" "Moonshark/router" "Moonshark/runner/lualibs" "Moonshark/runner/sqlite" "Moonshark/sessions" - "Moonshark/utils/logger" luajit "git.sharkk.net/Sky/LuaJIT-to-Go" "github.com/goccy/go-json" diff --git a/runner/sqlite/sqlite.go b/runner/sqlite/sqlite.go index b6e69d8..4e51905 100644 --- a/runner/sqlite/sqlite.go +++ b/runner/sqlite/sqlite.go @@ -12,7 +12,7 @@ import ( "zombiezen.com/go/sqlite/sqlitex" "Moonshark/color" - "Moonshark/utils/logger" + "Moonshark/logger" luajit "git.sharkk.net/Sky/LuaJIT-to-Go" ) diff --git a/watchers/api.go b/watchers/api.go index 3ef8dc4..9d1bdd7 100644 --- a/watchers/api.go +++ b/watchers/api.go @@ -6,9 +6,9 @@ import ( "sync" "Moonshark/color" + "Moonshark/logger" "Moonshark/router" "Moonshark/runner" - "Moonshark/utils/logger" ) // Global watcher manager instance with explicit creation diff --git a/watchers/dir.go b/watchers/dir.go index fa35325..4a26753 100644 --- a/watchers/dir.go +++ b/watchers/dir.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "Moonshark/utils/logger" + "Moonshark/logger" ) // Default debounce time between detected change and callback diff --git a/watchers/manager.go b/watchers/manager.go index 83ff160..6b3fa91 100644 --- a/watchers/manager.go +++ b/watchers/manager.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "Moonshark/utils/logger" + "Moonshark/logger" ) // DefaultPollInterval is the time between directory checks