From 7d36e2d14815fddc8c699b2507866854a542c821 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 1 Nov 2025 15:06:11 +0100 Subject: [PATCH 1/3] add json formatting --- utils/jsonutils/jsonutils.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/utils/jsonutils/jsonutils.go b/utils/jsonutils/jsonutils.go index a432943f..7a461668 100644 --- a/utils/jsonutils/jsonutils.go +++ b/utils/jsonutils/jsonutils.go @@ -76,3 +76,9 @@ func ToJson[T any](obj T) string { return string(bytes) } + +func Pretty[T any](obj T) string { + bytes, _ := json.MarshalIndent(obj, "", " ") + + return string(bytes) +} \ No newline at end of file From 342e7e098d12f147a8e4a78f32c1e7fddced03d6 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 1 Nov 2025 15:06:19 +0100 Subject: [PATCH 2/3] add data formatting --- utils/logger/logger.go | 46 +++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/utils/logger/logger.go b/utils/logger/logger.go index 0fc6f760..3eaf3c2f 100644 --- a/utils/logger/logger.go +++ b/utils/logger/logger.go @@ -2,8 +2,11 @@ package logger import ( "fmt" + "image/color" + "strconv" "strings" + "github.com/codeshelldev/secured-signal-api/utils/jsonutils" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -47,36 +50,55 @@ func Init(level string) { } } +func Format(data ...any) string { + res := "" + + for _, item := range data { + switch value := item.(type) { + case string: + res += value + case int: + res += strconv.Itoa(value) + default: + res += "\n" + ColorCode(jsonutils.Pretty(value), color.RGBA{ + R: 0, G: 215, B: 135, + }) + } + } + + return res +} + func Level() string { return LevelString(_log.Level()) } -func Info(msg ...string) { - _log.Info(strings.Join(msg, "")) +func Info(data ...any) { + _log.Info(Format(data...)) } -func Debug(msg ...string) { - _log.Debug(strings.Join(msg, "")) +func Debug(data ...any) { + _log.Debug(Format(data...)) } -func Dev(msg ...string) { - ok := _log.Check(DeveloperLevel, strings.Join(msg, "")) +func Dev(data ...any) { + ok := _log.Check(DeveloperLevel, Format(data...)) if ok != nil { ok.Write() } } -func Error(msg ...string) { - _log.Error(strings.Join(msg, "")) +func Error(data ...any) { + _log.Error(Format(data...)) } -func Fatal(msg ...string) { - _log.Fatal(strings.Join(msg, "")) +func Fatal(data ...any) { + _log.Fatal(Format(data...)) } -func Warn(msg ...string) { - _log.Warn(strings.Join(msg, "")) +func Warn(data ...any) { + _log.Warn(Format(data...)) } func Sync() { From 536dd92f05d72b1ab1be57a60976de9b5721de6e Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 1 Nov 2025 15:06:25 +0100 Subject: [PATCH 3/3] move config logs --- internals/config/loader.go | 7 ++++--- main.go | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/internals/config/loader.go b/internals/config/loader.go index d5a408ab..e707d63c 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -9,7 +9,6 @@ import ( "github.com/codeshelldev/secured-signal-api/internals/config/structure" "github.com/codeshelldev/secured-signal-api/utils/configutils" - jsonutils "github.com/codeshelldev/secured-signal-api/utils/jsonutils" log "github.com/codeshelldev/secured-signal-api/utils/logger" "github.com/knadh/koanf/parsers/yaml" @@ -58,9 +57,11 @@ func Load() { InitEnv() log.Info("Finished Loading Configuration") +} - log.Dev("Loaded Config:\n" + jsonutils.ToJson(mainConf.Layer.All())) - log.Dev("Loaded Token Configs:\n" + jsonutils.ToJson(tokenConf.Layer.All())) +func Log() { + log.Dev("Loaded Config:", mainConf.Layer.All()) + log.Dev("Loaded Token Configs:", tokenConf.Layer.All()) } func Clear() { diff --git a/main.go b/main.go index 73201daf..3ac13228 100644 --- a/main.go +++ b/main.go @@ -37,6 +37,8 @@ func main() { log.Dev("CTRL+S config to Print to Console") } + config.Log() + proxy = reverseProxy.Create(ENV.API_URL) handler := proxy.Init()