CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-05-27 12:52:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmd/cli: make validating remote config non-fatal during restart

Browse Source 
Since we already have a config on disk, it's better to enforce what we
have instead of fatal.
This commit is contained in:
Cuong Manh Le
2025-02-07 15:46:07 +07:00
committed by Cuong Manh Le
parent caf98b4dfe
commit 253a57ca01
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/cli/cli.go
+9 -2
View File
@@ -1807,10 +1807,17 @@ func resetDnsTask(p *prog, s service.Service, isCtrldInstalled bool, ir *ifaceRe
}
// doValidateCdRemoteConfig fetches and validates custom config for cdUID.
func doValidateCdRemoteConfig(cdUID string) {
func doValidateCdRemoteConfig(cdUID string, fatal bool) {
rc, err := controld.FetchResolverConfig(cdUID, rootCmd.Version, cdDev)
if err != nil {
mainLog.Load().Fatal().Err(err).Msgf("failed to fetch resolver uid: %s", cdUID)
logger := mainLog.Load().Fatal()
if !fatal {
logger = mainLog.Load().Warn()
}
logger.Err(err).Err(err).Msgf("failed to fetch resolver uid: %s", cdUID)
if !fatal {
return
}
}
// validateCdRemoteConfig clobbers v, saving it here to restore later.
oldV := v