From 1f23570f7645621dbc528b97e60ae268632be9b8 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Tue, 10 Jun 2025 14:36:03 +0200 Subject: [PATCH] fix logging example --- cmd/logging.yaml | 6 ------ logging.yaml | 7 +++++++ pkg/logging/init.go | 6 ++++++ pkg/logging/logging.yaml | 2 -- 4 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 cmd/logging.yaml create mode 100644 logging.yaml delete mode 100644 pkg/logging/logging.yaml diff --git a/cmd/logging.yaml b/cmd/logging.yaml deleted file mode 100644 index 76dbc94..0000000 --- a/cmd/logging.yaml +++ /dev/null @@ -1,6 +0,0 @@ -log_levels: - default: debug - github.com/netbirdio/management-refactor/internals/shared/activity: error - github.com/netbirdio/management-refactor/internals/shared/db: debug - github.com/netbirdio/management-refactor/internals/shared/permissions: debug - github.com/netbirdio/management-refactor/internals/modules/peers/manager: warn diff --git a/logging.yaml b/logging.yaml new file mode 100644 index 0000000..d66945e --- /dev/null +++ b/logging.yaml @@ -0,0 +1,7 @@ +log_levels: + default: trace + management-refactor/internals/shared/activity: error + management-refactor/internals/shared/db: debug + management-refactor/internals/shared/permissions: debug + management-refactor/internals/modules/peers/manager: warn + management-cloud-refactor/integrations: warn diff --git a/pkg/logging/init.go b/pkg/logging/init.go index e64a1fd..0bd722f 100644 --- a/pkg/logging/init.go +++ b/pkg/logging/init.go @@ -27,6 +27,8 @@ var ( loggers = map[string]*logrus.Logger{} ) +const basePrefix = "github.com/netbirdio/" + // Init reads the logging config from a YAML file and sets up per-package loggers. func Init(configFilePath string) error { v := viper.New() @@ -121,6 +123,10 @@ func LoggerForThisPackage() *logrus.Logger { fullFuncName := fn.Name() pkgPath := parsePackageFromFuncName(fullFuncName) + if strings.HasPrefix(pkgPath, basePrefix) { + pkgPath = strings.TrimPrefix(pkgPath, basePrefix) + } + return LoggerFor(pkgPath) } diff --git a/pkg/logging/logging.yaml b/pkg/logging/logging.yaml deleted file mode 100644 index 7be53f4..0000000 --- a/pkg/logging/logging.yaml +++ /dev/null @@ -1,2 +0,0 @@ -log_levels: - management-refactor/internal/shared/db: debug \ No newline at end of file