Simplify lifecycle logs

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

View File

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