You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@yunikorn.apache.org by wi...@apache.org on 2023/06/28 00:28:19 UTC
[yunikorn-core] branch master updated: [YUNIKORN-18223] Remove obsolete log.Logger() function (#582)
This is an automated email from the ASF dual-hosted git repository.
wilfreds pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-core.git
The following commit(s) were added to refs/heads/master by this push:
new 741452e5 [YUNIKORN-18223] Remove obsolete log.Logger() function (#582)
741452e5 is described below
commit 741452e5679b89b397c84b6ad81fc436292ab11b
Author: Craig Condit <cc...@apache.org>
AuthorDate: Wed Jun 28 10:28:03 2023 +1000
[YUNIKORN-18223] Remove obsolete log.Logger() function (#582)
Closes: #582
Signed-off-by: Wilfred Spiegelenburg <wi...@apache.org>
---
pkg/log/logger.go | 74 +++++++++++++++++++-------------------------------
pkg/log/logger_test.go | 2 +-
2 files changed, 29 insertions(+), 47 deletions(-)
diff --git a/pkg/log/logger.go b/pkg/log/logger.go
index 8a14880c..559312eb 100644
--- a/pkg/log/logger.go
+++ b/pkg/log/logger.go
@@ -54,33 +54,33 @@ const (
// Defined loggers: when adding new loggers, ids must be sequential, and all must be added to the loggers slice in the same order
var (
- Core = &LoggerHandle{id: 1, name: "core"}
- Test = &LoggerHandle{id: 2, name: "test"}
- Deprecation = &LoggerHandle{id: 3, name: "deprecation"}
- Config = &LoggerHandle{id: 4, name: "core.config"}
- Entrypoint = &LoggerHandle{id: 5, name: "core.entrypoint"}
- Events = &LoggerHandle{id: 6, name: "core.events"}
- OpenTracing = &LoggerHandle{id: 7, name: "core.opentracing"}
- Resources = &LoggerHandle{id: 8, name: "core.resources"}
- REST = &LoggerHandle{id: 9, name: "core.rest"}
- RMProxy = &LoggerHandle{id: 10, name: "core.rmproxy"}
- RPC = &LoggerHandle{id: 11, name: "core.rpc"}
- Metrics = &LoggerHandle{id: 12, name: "core.metrics"}
- Scheduler = &LoggerHandle{id: 13, name: "core.scheduler"}
- SchedAllocation = &LoggerHandle{id: 14, name: "core.scheduler.allocation"}
- SchedApplication = &LoggerHandle{id: 15, name: "core.scheduler.application"}
- SchedAppUsage = &LoggerHandle{id: 16, name: "core.scheduler.application.usage"}
- SchedContext = &LoggerHandle{id: 17, name: "core.scheduler.context"}
- SchedFSM = &LoggerHandle{id: 18, name: "core.scheduler.fsm"}
- SchedHealth = &LoggerHandle{id: 19, name: "core.scheduler.health"}
- SchedNode = &LoggerHandle{id: 20, name: "core.scheduler.node"}
- SchedPartition = &LoggerHandle{id: 21, name: "core.scheduler.partition"}
- SchedPreemption = &LoggerHandle{id: 22, name: "core.scheduler.preemption"}
- SchedQueue = &LoggerHandle{id: 23, name: "core.scheduler.queue"}
- SchedReservation = &LoggerHandle{id: 24, name: "core.scheduler.reservation"}
- SchedUGM = &LoggerHandle{id: 25, name: "core.scheduler.ugm"}
- Security = &LoggerHandle{id: 26, name: "core.security"}
- Utils = &LoggerHandle{id: 27, name: "core.utils"}
+ Core = &LoggerHandle{id: 0, name: "core"}
+ Test = &LoggerHandle{id: 1, name: "test"}
+ Deprecation = &LoggerHandle{id: 2, name: "deprecation"}
+ Config = &LoggerHandle{id: 3, name: "core.config"}
+ Entrypoint = &LoggerHandle{id: 4, name: "core.entrypoint"}
+ Events = &LoggerHandle{id: 5, name: "core.events"}
+ OpenTracing = &LoggerHandle{id: 6, name: "core.opentracing"}
+ Resources = &LoggerHandle{id: 7, name: "core.resources"}
+ REST = &LoggerHandle{id: 8, name: "core.rest"}
+ RMProxy = &LoggerHandle{id: 9, name: "core.rmproxy"}
+ RPC = &LoggerHandle{id: 10, name: "core.rpc"}
+ Metrics = &LoggerHandle{id: 11, name: "core.metrics"}
+ Scheduler = &LoggerHandle{id: 12, name: "core.scheduler"}
+ SchedAllocation = &LoggerHandle{id: 13, name: "core.scheduler.allocation"}
+ SchedApplication = &LoggerHandle{id: 14, name: "core.scheduler.application"}
+ SchedAppUsage = &LoggerHandle{id: 15, name: "core.scheduler.application.usage"}
+ SchedContext = &LoggerHandle{id: 16, name: "core.scheduler.context"}
+ SchedFSM = &LoggerHandle{id: 17, name: "core.scheduler.fsm"}
+ SchedHealth = &LoggerHandle{id: 18, name: "core.scheduler.health"}
+ SchedNode = &LoggerHandle{id: 19, name: "core.scheduler.node"}
+ SchedPartition = &LoggerHandle{id: 20, name: "core.scheduler.partition"}
+ SchedPreemption = &LoggerHandle{id: 21, name: "core.scheduler.preemption"}
+ SchedQueue = &LoggerHandle{id: 22, name: "core.scheduler.queue"}
+ SchedReservation = &LoggerHandle{id: 23, name: "core.scheduler.reservation"}
+ SchedUGM = &LoggerHandle{id: 24, name: "core.scheduler.ugm"}
+ Security = &LoggerHandle{id: 25, name: "core.security"}
+ Utils = &LoggerHandle{id: 26, name: "core.utils"}
)
// this tracks all the known logger handles, used to preallocate the real logger instances when configuration changes
@@ -98,25 +98,11 @@ type loggerConfig struct {
// tracks the currently used set of loggers; replaced completely whenever configuration changes
var currentLoggerConfig = atomic.Pointer[loggerConfig]{}
-// tracks the default logger handle, which is used for legacy log.Logger() calls
-var defaultLogger = atomic.Pointer[LoggerHandle]{}
-
-// Logger retrieves the global logger.
-//
-// Deprecated: Use Log(loggerHandle) instead.
-func Logger() *zap.Logger {
- once.Do(initLogger)
- return Log(defaultLogger.Load())
-}
-
// Log retrieves a named logger
func Log(handle *LoggerHandle) *zap.Logger {
once.Do(initLogger)
- if handle == nil || handle.id == 0 {
- handle = defaultLogger.Load()
- }
conf := currentLoggerConfig.Load()
- return conf.loggers[handle.id-1]
+ return conf.loggers[handle.id]
}
// createLogger creates a new, named logger that has log levels filtered based on the given configuration.
@@ -180,9 +166,6 @@ func initLogger() {
}
}
- // set default logger
- defaultLogger.Store(Core)
-
// initialize sub-loggers
initLoggingConfig(nil)
}
@@ -191,7 +174,6 @@ func InitializeLogger(log *zap.Logger, zapConfig *zap.Config) {
once.Do(func() {
logger = log
zapConfigs = zapConfig
- defaultLogger.Store(Core)
initLoggingConfig(nil)
})
}
diff --git a/pkg/log/logger_test.go b/pkg/log/logger_test.go
index a0db0405..8ec6a18f 100644
--- a/pkg/log/logger_test.go
+++ b/pkg/log/logger_test.go
@@ -45,7 +45,7 @@ func TestLoggerIds(t *testing.T) {
for i := 0; i < len(loggers); i++ {
handle := loggers[i]
assert.Assert(t, handle != nil, "nil handle for index", i)
- assert.Equal(t, handle.id, i+1, "wrong id", handle.name)
+ assert.Equal(t, handle.id, i, "wrong id", handle.name)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@yunikorn.apache.org
For additional commands, e-mail: issues-help@yunikorn.apache.org