From 8a2c48e996f9b6331d952a2e7ee3d242d3bb9030 Mon Sep 17 00:00:00 2001
From: Cuong Manh Le <cuong@windscribe.com>
Date: Mon, 23 Jan 2023 13:41:43 +0700
Subject: [PATCH] cmd/ctrld: allow log/cache flags work wit --cd flag

---
 cmd/ctrld/cli.go | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/cmd/ctrld/cli.go b/cmd/ctrld/cli.go
index 173d1f7..f0c8e60 100644
--- a/cmd/ctrld/cli.go
+++ b/cmd/ctrld/cli.go
@@ -32,7 +32,7 @@ var (
 	defaultConfigFile    = "ctrld.toml"
 )
 
-var basicModeFlags = []string{"listen", "primary_upstream", "secondary_upstream", "domains", "log", "cache_size"}
+var basicModeFlags = []string{"listen", "primary_upstream", "secondary_upstream", "domains"}
 
 func isNoConfigStart(cmd *cobra.Command) bool {
 	for _, flagName := range basicModeFlags {
@@ -108,6 +108,7 @@ func initCLI() {
 				log.Fatal("network is not up yet")
 			}
 			processCDFlags()
+			processLogAndCacheFlags()
 			if err := ctrld.ValidateConfig(validator.New(), &cfg); err != nil {
 				log.Fatalf("invalid config: %v", err)
 			}
@@ -512,8 +513,6 @@ func processNoConfigFlags(noConfigStart bool) {
 		lc.Policy = &ctrld.ListenerPolicyConfig{Name: "My Policy", Rules: rules}
 	}
 	v.Set("upstream", upstream)
-
-	processLogAndCacheFlags()
 }
 
 func processCDFlags() {
@@ -577,6 +576,7 @@ func processCDFlags() {
 	v.Set("network", cfg.Network)
 	v.Set("upstream", cfg.Upstream)
 	v.Set("listener", cfg.Listener)
+	processLogAndCacheFlags()
 	writeConfigFile()
 }
 
@@ -602,17 +602,15 @@ func processListenFlag() {
 }
 
 func processLogAndCacheFlags() {
-	sc := ctrld.ServiceConfig{}
 	if logPath != "" {
-		sc.LogLevel = "debug"
-		sc.LogPath = logPath
+		cfg.Service.LogPath = logPath
 	}
 
 	if cacheSize != 0 {
-		sc.CacheEnable = true
-		sc.CacheSize = cacheSize
+		cfg.Service.CacheEnable = true
+		cfg.Service.CacheSize = cacheSize
 	}
-	v.Set("service", sc)
+	v.Set("service", cfg.Service)
 }
 
 func netIfaceFromName(ifaceName string) (*net.Interface, error) {