Skip to content

feat: add fallback NTP server support #782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhduiy merged 1 commit into from
May 13, 2025
Merged

feat: add fallback NTP server support #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions misc/dsg-configs/org.deepin.dde.daemon.timedated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@
"description": "current ntp server",
"permissions": "readwrite",
"visibility": "private"
},
"FallbackNTPServer": {
"value": "ntp.aliyun.com",
"serial": 0,
"flags": ["global"],
"name": "fallback ntp server",
"name[zh_CN]": "后备的NTP服务地址",
"description": "fallback ntp server",
"permissions": "readonly",
"visibility": "private"
}
}
}
48 changes: 37 additions & 11 deletions system/timedate1/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,16 @@ import (
//go:generate dbusutil-gen em -type Manager

type Manager struct {
core timedate1.Timedate
service *dbusutil.Service
PropsMu sync.RWMutex
NTPServer string
timesyncd timesync1.Timesync1
systemd systemd1.Manager
setNTPServerMu sync.RWMutex
signalLoop *dbusutil.SignalLoop
dsManager ConfigManager.Manager
core timedate1.Timedate
service *dbusutil.Service
PropsMu sync.RWMutex
NTPServer string
timesyncd timesync1.Timesync1
systemd systemd1.Manager
setNTPServerMu sync.RWMutex
signalLoop *dbusutil.SignalLoop
dsManager ConfigManager.Manager
fallbackNTPServer string
}

const (
Expand All @@ -54,6 +55,7 @@ const (
dsettingsTimeDatedName = "org.deepin.dde.daemon.timedated"
dsettingsKeyObsoleteNTPServer = "ObsoleteNTPServer"
dsettingsKeyNTPServer = "NTPServer"
dsettingsFallbackNTPServer = "FallbackNTPServer"
)

func NewManager(service *dbusutil.Service) (*Manager, error) {
Expand Down Expand Up @@ -108,6 +110,18 @@ func (m *Manager) getDsgNTPServer() string {
return v.Value().(string)
}

func (m *Manager) getDsgFallbackNTPServer() string {
if m.dsManager == nil {
return ""
}
v, err := m.dsManager.Value(0, dsettingsFallbackNTPServer)
if err != nil {
logger.Warning(err)
return ""
}
return v.Value().(string)
}

func (m *Manager) setDsgObsoleteNTPServer(server string) error {
if m.dsManager == nil {
return errors.New("dsManager is nil")
Expand Down Expand Up @@ -136,6 +150,7 @@ func (m *Manager) start() {
}
obsoleteNTPServer := m.getDsgObsoleteNTPServer()
ntpServer := m.getDsgNTPServer()
m.fallbackNTPServer = m.getDsgFallbackNTPServer()

logger.Infof("dsg obolete ntp server: %s; dsg ntp server: %s", obsoleteNTPServer, ntpServer)
m.systemd = systemd1.NewManager(m.service.Conn())
Expand Down Expand Up @@ -259,7 +274,7 @@ func (m *Manager) setNTPServer(value string) error {

m.setNTPServerMu.Lock()
defer m.setNTPServerMu.Unlock()
err := setNTPServer(value)
err := m.setNTPServerToTimeSyncd(value)
if err != nil {
return err
}
Expand Down Expand Up @@ -313,13 +328,24 @@ func doAuthorized(msg, sysBusName string) (bool, error) {
return ret.IsAuthorized, nil
}

func setNTPServer(server string) error {
func (m *Manager) setNTPServerToTimeSyncd(server string) error {
kf := keyfile.NewKeyFile()
err := kf.LoadFromFile(timeSyncCfgFile)
if err != nil && !os.IsNotExist(err) {
return err
}

setFallback, err := m.dsManager.IsDefaultValue(0, dsettingsKeyNTPServer)
if err != nil {
logger.Warning(err)
}

if setFallback && m.fallbackNTPServer != "" {
// 配置支持FallbackNtp字段，经过验证无法达到要求，故采用这种方式
server += " " + m.fallbackNTPServer
logger.Infof("set fallback ntp server: %s", m.fallbackNTPServer)
}

kf.SetString("Time", "NTP", server)

dir := filepath.Dir(timeSyncCfgFile)
Expand Down