From 4f125cf107b1b1454585cd5ed4289052e41db213 Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Wed, 15 Nov 2023 14:58:36 +0700 Subject: [PATCH] cmd/cli: notice users where config file is written/read --- cmd/cli/cli.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmd/cli/cli.go b/cmd/cli/cli.go index 26f228b..5215b14 100644 --- a/cmd/cli/cli.go +++ b/cmd/cli/cli.go @@ -266,6 +266,9 @@ func initCLI() { {s.Uninstall, false}, {s.Install, false}, {s.Start, true}, + // Note that startCmd do not actually write ControlD config, but the config file was + // generated after s.Start, so we notice users here for consistent with nextdns mode. + {noticeWritingControlDConfig, false}, } mainLog.Load().Notice().Msg("Starting service") if doTasks(tasks) { @@ -1042,6 +1045,7 @@ func readConfigFile(writeDefaultConfig bool) bool { // If err == nil, there's a config supplied via `--config`, no default config written. err := v.ReadInConfig() if err == nil { + mainLog.Load().Notice().Msg("Reading config: " + v.ConfigFileUsed()) mainLog.Load().Info().Msg("loading config file from: " + v.ConfigFileUsed()) defaultConfigFile = v.ConfigFileUsed() return true @@ -1984,3 +1988,10 @@ func doGenerateNextDNSConfig(uid string) error { updateListenerConfig(&cfg) return writeConfigFile() } + +func noticeWritingControlDConfig() error { + if cdUID != "" { + mainLog.Load().Notice().Msgf("Generating controld config: %s", defaultConfigFile) + } + return nil +}