Skip to content

Commit e27641d

Browse files
author
dapeng
committed
refactor(core): optimize NewCore function and logger initialization
- Remove global defaultLog variable - Use GetDefaultLogger() directly in NewCore and tests- Initialize defaultLogger with level field in GetDefaultLogger
1 parent 7e0a267 commit e27641d

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

core.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,19 @@ func (g *Flag) goneFlag() {}
5353
// and loads itself as a Goner to enable self-injection.
5454
// Returns a pointer to the initialized Core.
5555
func NewCore() *Core {
56+
var logger = GetDefaultLogger()
5657
loader := Core{
5758
nameMap: make(map[string]*coffin),
5859
typeProviderMap: make(map[reflect.Type]*wrapProvider),
5960
typeProviderDepMap: make(map[reflect.Type]*coffin),
6061
loaderMap: make(map[LoaderKey]bool),
61-
log: GetDefaultLogger(),
62+
log: logger,
6263
}
6364

6465
_ = loader.Load(&loader, IsDefault())
6566
_ = loader.Load(&ConfigProvider{})
6667
_ = loader.Load(&EnvConfigure{}, Name("configure"), IsDefault(new(Configure)), OnlyForName())
67-
_ = loader.Load(defaultLog, IsDefault(new(Logger)))
68+
_ = loader.Load(logger.(Goner), IsDefault(new(Logger)))
6869
return &loader
6970
}
7071

core_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ func TestCore_Fill(t *testing.T) {
328328
for _, tt := range tests {
329329
t.Run(tt.name, func(t *testing.T) {
330330
core := NewCore()
331-
_ = core.Load(defaultLog)
331+
_ = core.Load(GetDefaultLogger().(Goner))
332332
_ = core.Load(&ConfigProvider{})
333333
_ = core.Load(&EnvConfigure{}, Name("configure"), IsDefault(new(Configure)), OnlyForName())
334334
tt.setup(core)
@@ -379,7 +379,7 @@ func TestCore_Check(t *testing.T) {
379379
for _, tt := range tests {
380380
t.Run(tt.name, func(t *testing.T) {
381381
core := NewCore()
382-
_ = core.Load(defaultLog)
382+
_ = core.Load(GetDefaultLogger().(Goner))
383383
_ = core.Load(&ConfigProvider{})
384384
_ = core.Load(&EnvConfigure{}, Name("configure"), IsDefault(new(Configure)), OnlyForName())
385385
tt.setup(core)

logger.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,10 @@ type Logger interface {
2525

2626
const LoggerName = "gone-logger"
2727

28-
var defaultLog = &defaultLogger{}
29-
3028
func GetDefaultLogger() Logger {
31-
if defaultLog == nil {
32-
defaultLog = &defaultLogger{}
29+
return &defaultLogger{
30+
level: new(string),
3331
}
34-
return defaultLog
3532
}
3633

3734
type defaultLogger struct {

0 commit comments

Comments
 (0)