Fix log

j178 · Jan 2, 2023 · 7be7589 · 7be7589
1 parent 68777fd
commit 7be7589
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -77,12 +77,8 @@ var rootCmd = &cobra.Command{
 	Version:       buildVersion(version, commit, date),
 	SilenceErrors: true,
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-		err := loadConfig(cmd, args)
-		if err != nil {
-			return err
-		}
 		initLogger()
-		return nil
+		return loadConfig(cmd, args)
 	},
 }
 

diff --git a/leetcode/cache_json.go b/leetcode/cache_json.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-hclog"
-	"github.com/j178/leetgo/config"
 	"github.com/j178/leetgo/utils"
 )
 
@@ -20,7 +19,7 @@ type jsonCache struct {
 }
 
 func newJsonCache(path string) QuestionsCache {
-	return &jsonCache{path: config.Get().LeetCodeCacheFile()}
+	return &jsonCache{path: path}
 }
 
 func (c *jsonCache) doLoad() error {
@@ -52,7 +51,7 @@ func (c *jsonCache) load() {
 		func() {
 			err := c.doLoad()
 			if err != nil {
-				hclog.L().Warn("failed to load jsonCache, try updating with `leetgo jsonCache update`")
+				hclog.L().Warn("failed to load cache, try updating with `leetgo cache update`")
 				return
 			}
 			c.checkUpdateTime()
@@ -66,7 +65,7 @@ func (c *jsonCache) checkUpdateTime() {
 		return
 	}
 	if time.Since(stat.ModTime()) >= 14*24*time.Hour {
-		hclog.L().Warn("jsonCache is too old, try updating with `leetgo jsonCache update`")
+		hclog.L().Warn("cache is too old, try updating with `leetgo cache update`")
 	}
 }
 
@@ -109,7 +108,7 @@ func (c *jsonCache) Update(client Client) error {
 	if err != nil {
 		return err
 	}
-	hclog.L().Info("jsonCache updated", "path", c.path)
+	hclog.L().Info("cache updated", "path", c.path)
 	return nil
 }
 

diff --git a/leetcode/cache_sqlite.go b/leetcode/cache_sqlite.go
@@ -28,7 +28,7 @@ func (c *sqliteCache) load() {
 			var err error
 			c.db, err = sql.Open("sqlite3", c.path)
 			if err != nil {
-				hclog.L().Warn("failed to load jsonCache, try updating with `leetgo jsonCache update`")
+				hclog.L().Warn("failed to load cache, try updating with `leetgo cache update`")
 				return
 			}
 			c.checkUpdateTime()
@@ -50,7 +50,7 @@ func (c *sqliteCache) checkUpdateTime() {
 		return
 	}
 	if time.Since(time.Unix(ts, 0)) >= 14*24*time.Hour {
-		hclog.L().Warn("jsonCache is too old, try updating with `leetgo jsonCache update`")
+		hclog.L().Warn("cache is too old, try updating with `leetgo cache update`")
 	}
 }
 
@@ -178,6 +178,6 @@ func (c *sqliteCache) Update(client Client) error {
 	if err != nil {
 		return err
 	}
-	hclog.L().Info("jsonCache updated", "path", c.path)
+	hclog.L().Info("cache updated", "path", c.path)
 	return nil
 }