apache
diff --git a/Collapse file
‎cmk.go‎
Copy file name to clipboardExpand all lines: cmk.go
+1Lines changed: 1 addition & 0 deletions b/Collapse file
‎cmk.go‎
Copy file name to clipboardExpand all lines: cmk.go
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file
‎config/cache.go‎
Copy file name to clipboardExpand all lines: config/cache.go
+1-3Lines changed: 1 addition & 3 deletions b/Collapse file
‎config/cache.go‎
Copy file name to clipboardExpand all lines: config/cache.go
+1-3Lines changed: 1 addition & 3 deletions
diff --git a/Collapse file
‎config/config.go‎
Copy file name to clipboardExpand all lines: config/config.go
+6-5Lines changed: 6 additions & 5 deletions b/Collapse file
‎config/config.go‎
Copy file name to clipboardExpand all lines: config/config.go
+6-5Lines changed: 6 additions & 5 deletions
@@ -86,6 +86,7 @@ func main() {
 	if *profile != "" {
 		cfg.LoadProfile(*profile)
 	}
+	config.LoadCache(cfg)
 
 	if *apiKey != "" && *secretKey != "" {
 		request := cmd.NewRequest(nil, cfg, nil)
 
@@ -84,9 +84,7 @@ func LoadCache(c *Config) interface{} {
 	Debug("Trying to read API cache from:", cacheFile)
 	cache, err := ioutil.ReadFile(cacheFile)
 	if err != nil {
-		if c.HasShell {
-			fmt.Fprintf(os.Stderr, "Loaded in-built API cache. Failed to read API cache, please run 'sync'.\n")
-		}
+		fmt.Fprintf(os.Stderr, "Loaded in-built API cache. Failed to read API cache, please run 'sync'.\n")
 		cache = []byte(preCache)
 	}
 	var data map[string]interface{}
 
@@ -200,7 +200,7 @@ func setActiveProfile(cfg *Config, profile *ServerProfile) {
 	cfg.ActiveProfile.Client = newHTTPClient(cfg)
 }
 
-func reloadConfig(cfg *Config) *Config {
+func reloadConfig(cfg *Config, loadCache bool) *Config {
 	fileLock := flock.New(path.Join(getDefaultConfigDir(), "lock"))
 	err := fileLock.Lock()
 	if err != nil {
@@ -209,7 +209,9 @@ func reloadConfig(cfg *Config) *Config {
 	}
 	cfg = saveConfig(cfg)
 	fileLock.Unlock()
-	LoadCache(cfg)
+	if loadCache {
+		LoadCache(cfg)
+	}
 	return cfg
 }
 
@@ -360,7 +362,7 @@ func (c *Config) UpdateConfig(key string, value string, update bool) {
 	Debug("UpdateConfig key:", key, " value:", value, " update:", update)
 
 	if update {
-		reloadConfig(c)
+		reloadConfig(c, true)
 	}
 }
 
@@ -376,7 +378,6 @@ func NewConfig(configFilePath *string) *Config {
 			os.Exit(1)
 		}
 	}
-	cfg := reloadConfig(defaultConf)
-	LoadCache(cfg)
+	cfg := reloadConfig(defaultConf, false)
 	return cfg
 }
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ func main() {`
`86`	`86`	`if *profile != "" {`
`87`	`87`	`cfg.LoadProfile(*profile)`
`88`	`88`	`}`
	`89`	`+ config.LoadCache(cfg)`
`89`	`90`
`90`	`91`	`if apiKey != "" && secretKey != "" {`
`91`	`92`	`request := cmd.NewRequest(nil, cfg, nil)`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ func setActiveProfile(cfg Config, profile ServerProfile) {`
`200`	`200`	`cfg.ActiveProfile.Client = newHTTPClient(cfg)`
`201`	`201`	`}`
`202`	`202`
`203`		`-func reloadConfig(cfg Config) Config {`
	`203`	`+func reloadConfig(cfg Config, loadCache bool) Config {`
`204`	`204`	`fileLock := flock.New(path.Join(getDefaultConfigDir(), "lock"))`
`205`	`205`	`err := fileLock.Lock()`
`206`	`206`	`if err != nil {`
`@@ -209,7 +209,9 @@ func reloadConfig(cfg Config) Config {`
`209`	`209`	`}`
`210`	`210`	`cfg = saveConfig(cfg)`
`211`	`211`	`fileLock.Unlock()`
`212`		`- LoadCache(cfg)`
	`212`	`+ if loadCache {`
	`213`	`+ LoadCache(cfg)`
	`214`	`+ }`
`213`	`215`	`return cfg`
`214`	`216`	`}`
`215`	`217`
`@@ -360,7 +362,7 @@ func (c *Config) UpdateConfig(key string, value string, update bool) {`
`360`	`362`	`Debug("UpdateConfig key:", key, " value:", value, " update:", update)`
`361`	`363`
`362`	`364`	`if update {`
`363`		`- reloadConfig(c)`
	`365`	`+ reloadConfig(c, true)`
`364`	`366`	`}`
`365`	`367`	`}`
`366`	`368`
`@@ -376,7 +378,6 @@ func NewConfig(configFilePath string) Config {`
`376`	`378`	`os.Exit(1)`
`377`	`379`	`}`
`378`	`380`	`}`
`379`		`- cfg := reloadConfig(defaultConf)`
`380`		`- LoadCache(cfg)`
	`381`	`+ cfg := reloadConfig(defaultConf, false)`
`381`	`382`	`return cfg`
`382`	`383`	`}`