SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-04 12:27:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

ntp: Ignore setup error

Browse source
This commit is contained in:
世界 2024-07-31 10:24:50 +08:00
parent a2f9fef936
commit f97054e917
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
common/ntp/service.go
View file

@ -26,6 +26,7 @@ type Options struct {
Logger logger.Logger Logger logger.Logger
Server M.Socksaddr Server M.Socksaddr
Interval time.Duration Interval time.Duration
Timeout time.Duration
WriteToSystem bool WriteToSystem bool
} }
@ -39,6 +40,7 @@ type Service struct {
server M.Socksaddr server M.Socksaddr
writeToSystem bool writeToSystem bool
ticker *time.Ticker ticker *time.Ticker
timeout time.Duration
clockOffset time.Duration clockOffset time.Duration
pause pause.Manager pause pause.Manager
} }
@ -81,6 +83,7 @@ func NewService(options Options) *Service {
writeToSystem: options.WriteToSystem, writeToSystem: options.WriteToSystem,
server: destination, server: destination,
ticker: time.NewTicker(interval), ticker: time.NewTicker(interval),
timeout: options.Timeout,
pause: service.FromContext[pause.Manager](ctx), pause: service.FromContext[pause.Manager](ctx),
} }
} }
@ -88,9 +91,10 @@ func NewService(options Options) *Service {
func (s *Service) Start() error { func (s *Service) Start() error {
err := s.update() err := s.update()
if err != nil { if err != nil {
return E.Cause(err, "initialize time") s.logger.Error(E.Cause(err, "initialize time"))
} else {
s.logger.Info("updated time: ", s.TimeFunc()().Local().Format(TimeLayout))
} }
s.logger.Info("updated time: ", s.TimeFunc()().Local().Format(TimeLayout))
go s.loopUpdate() go s.loopUpdate()
return nil return nil
} }
@ -124,15 +128,23 @@ func (s *Service) loopUpdate() {
} }
err := s.update() err := s.update()
if err == nil { if err == nil {
s.logger.Debug("updated time: ", s.TimeFunc()().Local().Format(TimeLayout)) s.logger.Info("updated time: ", s.TimeFunc()().Local().Format(TimeLayout))
} else { } else {
s.logger.Warn("update time: ", err) s.logger.Error("update time: ", err)
} }
} }
} }
func (s *Service) update() error { func (s *Service) update() error {
ctx := s.ctx
var cancel context.CancelFunc
if s.timeout > 0 {
ctx, cancel = context.WithTimeout(ctx, s.timeout)
}
response, err := Exchange(s.ctx, s.dialer, s.server) response, err := Exchange(s.ctx, s.dialer, s.server)
if cancel != nil {
cancel()
}
if err != nil { if err != nil {
return err return err
} }
@ -140,7 +152,7 @@ func (s *Service) update() error {
if s.writeToSystem { if s.writeToSystem {
writeErr := SetSystemTime(s.TimeFunc()()) writeErr := SetSystemTime(s.TimeFunc()())
if writeErr != nil { if writeErr != nil {
s.logger.Warn("write time to system: ", writeErr) s.logger.Error("write time to system: ", writeErr)
} }
} }
return nil return nil