From 346c33b4d5f313bb2b864415e644ab56c5998e21 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Sat, 4 Apr 2020 13:29:25 -0600 Subject: cmd: Log warning if --resume and --config used together There's nothing actually risky/dangerous in this situation, it's mostly an attempt to get the user's attention --- cmd/commandfuncs.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'cmd/commandfuncs.go') diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go index 46de9de..efdcfdc 100644 --- a/cmd/commandfuncs.go +++ b/cmd/commandfuncs.go @@ -171,7 +171,15 @@ func cmdRun(fl Flags) (int, error) { } else if err != nil { return caddy.ExitCodeFailedStartup, err } else { - caddy.Log().Info("resuming from last configuration", zap.String("autosave_file", caddy.ConfigAutosavePath)) + if runCmdConfigFlag == "" { + caddy.Log().Info("resuming from last configuration", + zap.String("autosave_file", caddy.ConfigAutosavePath)) + } else { + // if they also specified a config file, user should be aware that we're not + // using it (doing so could lead to data/config loss by overwriting!) + caddy.Log().Warn("--config and --resume flags were used together; ignoring --config and resuming from last configuration", + zap.String("autosave_file", caddy.ConfigAutosavePath)) + } } } // we don't use 'else' here since this value might have been changed in 'if' block; i.e. not mutually exclusive -- cgit v1.2.3