yanistyle/sing-box-extended
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-05-14 00:51:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify lifecycle logs

Browse Source
This commit is contained in:
世界
2026-04-19 23:25:00 +08:00
parent e4bc459975
commit 60dd7ea5c9
6 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
adapter/endpoint/manager.go
View File

@@ -12,7 +12,6 @@ import (
"github.com/sagernet/sing-box/log" "github.com/sagernet/sing-box/log"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
F "github.com/sagernet/sing/common/format"
) )
var _ adapter.EndpointManager = (*Manager)(nil) var _ adapter.EndpointManager = (*Manager)(nil)
@@ -55,7 +54,7 @@ func (m *Manager) Start(stage adapter.StartStage) error {
if err != nil { if err != nil {
return E.Cause(err, stage, " ", name) return E.Cause(err, stage, " ", name)
} }
m.logger.Trace(stage, " ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, stage, " ", name)
} }
return nil return nil
} }
@@ -80,7 +79,7 @@ func (m *Manager) Close() error {
return E.Cause(err, "close ", name) return E.Cause(err, "close ", name)
}) })
monitor.Finish() monitor.Finish()
m.logger.Trace("close ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, "close ", name)
} }
return nil return nil
} }
@@ -137,7 +136,7 @@ func (m *Manager) Create(ctx context.Context, router adapter.Router, logger log.
if err != nil { if err != nil {
return E.Cause(err, stage, " ", name) return E.Cause(err, stage, " ", name)
} }
m.logger.Trace(stage, " ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, stage, " ", name)
} }
} }
if existsEndpoint, loaded := m.endpointByTag[tag]; loaded { if existsEndpoint, loaded := m.endpointByTag[tag]; loaded {

7
adapter/inbound/manager.go
View File

@@ -12,7 +12,6 @@ import (
"github.com/sagernet/sing-box/log" "github.com/sagernet/sing-box/log"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
F "github.com/sagernet/sing/common/format"
) )
var _ adapter.InboundManager = (*Manager)(nil) var _ adapter.InboundManager = (*Manager)(nil)
@@ -54,7 +53,7 @@ func (m *Manager) Start(stage adapter.StartStage) error {
if err != nil { if err != nil {
return E.Cause(err, stage, " ", name) return E.Cause(err, stage, " ", name)
} }
m.logger.Trace(stage, " ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, stage, " ", name)
} }
return nil return nil
} }
@@ -79,7 +78,7 @@ func (m *Manager) Close() error {
return E.Cause(err, "close ", name) return E.Cause(err, "close ", name)
}) })
monitor.Finish() monitor.Finish()
m.logger.Trace("close ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, "close ", name)
} }
return nil return nil
} }
@@ -139,7 +138,7 @@ func (m *Manager) Create(ctx context.Context, router adapter.Router, logger log.
if err != nil { if err != nil {
return E.Cause(err, stage, " ", name) return E.Cause(err, stage, " ", name)
} }
m.logger.Trace(stage, " ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, stage, " ", name)
} }
} }
if existsInbound, loaded := m.inboundByTag[tag]; loaded { if existsInbound, loaded := m.inboundByTag[tag]; loaded {

11
adapter/lifecycle.go
View File

@@ -83,7 +83,7 @@ func Start(logger log.ContextLogger, stage StartStage, services ...Lifecycle) er
if err != nil { if err != nil {
return err return err
} }
logger.Trace(stage, " ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") LogElapsed(logger, startTime, stage, " ", name)
} }
return nil return nil
} }
@@ -96,7 +96,14 @@ func StartNamed(logger log.ContextLogger, stage StartStage, services []Lifecycle
if err != nil { if err != nil {
return E.Cause(err, stage.String(), " ", service.Name()) return E.Cause(err, stage.String(), " ", service.Name())
} }
logger.Trace(stage, " ", service.Name(), " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") LogElapsed(logger, startTime, stage, " ", service.Name())
} }
return nil return nil
} }
func LogElapsed(logger log.ContextLogger, startTime time.Time, description ...any) {
duration := time.Since(startTime)
if duration > time.Second {
logger.Trace(append(description, " completed (", F.Seconds(duration.Seconds()), "s)")...)
}
}

11
adapter/outbound/manager.go
View File

@@ -14,7 +14,6 @@ import (
"github.com/sagernet/sing-box/log" "github.com/sagernet/sing-box/log"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
F "github.com/sagernet/sing/common/format"
"github.com/sagernet/sing/common/logger" "github.com/sagernet/sing/common/logger"
) )
@@ -90,7 +89,7 @@ func (m *Manager) Start(stage adapter.StartStage) error {
if err != nil { if err != nil {
return E.Cause(err, stage, " ", name) return E.Cause(err, stage, " ", name)
} }
m.logger.Trace(stage, " ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, stage, " ", name)
} }
} }
return nil return nil
@@ -125,7 +124,7 @@ func (m *Manager) startOutbounds(outbounds []adapter.Outbound) error {
if err != nil { if err != nil {
return E.Cause(err, "start ", name) return E.Cause(err, "start ", name)
} }
m.logger.Trace("start ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, "start ", name)
} else if starter, isStarter := outboundToStart.(interface { } else if starter, isStarter := outboundToStart.(interface {
Start() error Start() error
}); isStarter { }); isStarter {
@@ -137,7 +136,7 @@ func (m *Manager) startOutbounds(outbounds []adapter.Outbound) error {
if err != nil { if err != nil {
return E.Cause(err, "start ", name) return E.Cause(err, "start ", name)
} }
m.logger.Trace("start ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, "start ", name)
} }
} }
if len(started) == len(outbounds) { if len(started) == len(outbounds) {
@@ -192,7 +191,7 @@ func (m *Manager) Close() error {
return E.Cause(err, "close ", name) return E.Cause(err, "close ", name)
}) })
monitor.Finish() monitor.Finish()
m.logger.Trace("close ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, "close ", name)
} }
} }
return nil return nil
@@ -281,7 +280,7 @@ func (m *Manager) Create(ctx context.Context, router adapter.Router, logger log.
if err != nil { if err != nil {
return E.Cause(err, stage, " ", name) return E.Cause(err, stage, " ", name)
} }
m.logger.Trace(stage, " ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, stage, " ", name)
} }
} }
m.access.Lock() m.access.Lock()

7
adapter/service/manager.go
View File

@@ -12,7 +12,6 @@ import (
"github.com/sagernet/sing-box/log" "github.com/sagernet/sing-box/log"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
F "github.com/sagernet/sing/common/format"
) )
var _ adapter.ServiceManager = (*Manager)(nil) var _ adapter.ServiceManager = (*Manager)(nil)
@@ -52,7 +51,7 @@ func (m *Manager) Start(stage adapter.StartStage) error {
if err != nil { if err != nil {
return E.Cause(err, stage, " ", name) return E.Cause(err, stage, " ", name)
} }
m.logger.Trace(stage, " ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, stage, " ", name)
} }
return nil return nil
} }
@@ -77,7 +76,7 @@ func (m *Manager) Close() error {
return E.Cause(err, "close ", name) return E.Cause(err, "close ", name)
}) })
monitor.Finish() monitor.Finish()
m.logger.Trace("close ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, "close ", name)
} }
return nil return nil
} }
@@ -134,7 +133,7 @@ func (m *Manager) Create(ctx context.Context, logger log.ContextLogger, tag stri
if err != nil { if err != nil {
return E.Cause(err, stage, " ", name) return E.Cause(err, stage, " ", name)
} }
m.logger.Trace(stage, " ", name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(m.logger, startTime, stage, " ", name)
} }
} }
if existsService, loaded := m.serviceByTag[tag]; loaded { if existsService, loaded := m.serviceByTag[tag]; loaded {

6
box.go
View File

@@ -520,7 +520,7 @@ func (s *Box) Close() error {
err = E.Append(err, closeItem.service.Close(), func(err error) error { err = E.Append(err, closeItem.service.Close(), func(err error) error {
return E.Cause(err, "close ", closeItem.name) return E.Cause(err, "close ", closeItem.name)
}) })
s.logger.Trace("close ", closeItem.name, " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(s.logger, startTime, "close ", closeItem.name)
} }
for _, lifecycleService := range s.internalService { for _, lifecycleService := range s.internalService {
s.logger.Trace("close ", lifecycleService.Name()) s.logger.Trace("close ", lifecycleService.Name())
@@ -528,14 +528,14 @@ func (s *Box) Close() error {
err = E.Append(err, lifecycleService.Close(), func(err error) error { err = E.Append(err, lifecycleService.Close(), func(err error) error {
return E.Cause(err, "close ", lifecycleService.Name()) return E.Cause(err, "close ", lifecycleService.Name())
}) })
s.logger.Trace("close ", lifecycleService.Name(), " completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(s.logger, startTime, "close ", lifecycleService.Name())
} }
s.logger.Trace("close logger") s.logger.Trace("close logger")
startTime := time.Now() startTime := time.Now()
err = E.Append(err, s.logFactory.Close(), func(err error) error { err = E.Append(err, s.logFactory.Close(), func(err error) error {
return E.Cause(err, "close logger") return E.Cause(err, "close logger")
}) })
s.logger.Trace("close logger completed (", F.Seconds(time.Since(startTime).Seconds()), "s)") adapter.LogElapsed(s.logger, startTime, "close logger")
return err return err
} }