Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions internals/config/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 2 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 6 additions & 0 deletions utils/jsonutils/jsonutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
46 changes: 34 additions & 12 deletions utils/logger/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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() {
Expand Down