Skip to content

Commit bd4dca7

Browse files
committed
improve: log fields
1 parent 7c708af commit bd4dca7

File tree

4 files changed

+21
-15
lines changed

4 files changed

+21
-15
lines changed

internal/global/config.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ var ConfigLoader *config.Config
1515
var Config models.Config
1616

1717
func init() {
18+
logger := log.WithField("component", "config")
1819
home, err := homedir.Dir()
1920
if err != nil {
20-
log.Fatalln(err)
21+
logger.Fatalln(err)
2122
}
2223
home = file.PreparePath(home)
2324
ConfigLoader = config.NewConfig(&config.Options{
@@ -61,15 +62,15 @@ func init() {
6162
})
6263
if err = ConfigLoader.Load(); err != nil {
6364
if errors.Is(err, config.IsNewConfig) {
64-
log.Infoln(err.Error())
65+
logger.Infoln(err.Error())
6566
os.Exit(0)
6667
} else {
67-
log.Fatalln(err)
68+
logger.Fatalln(err)
6869
}
6970
}
7071

7172
if len(Config.Rules) == 0 {
72-
log.Warnln("no match rule found")
73+
logger.Warnln("no match rule found")
7374
}
7475
Config.Storage.ProjectDir = file.PreparePath(path.Clean(Config.Storage.ProjectDir))
7576
}

internal/global/log.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@ import (
66
)
77

88
func init() {
9-
log.SetFormatter(&nested.Formatter{})
9+
log.SetFormatter(&nested.Formatter{
10+
NoUppercaseLevel: true,
11+
HideKeys: true,
12+
})
1013
}

internal/pkg/project/clear.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ func dirShouldScan(file os.FileInfo) bool {
1616
}
1717

1818
func Clear(t time.Duration, yes, force bool, addresses ...string) error {
19+
logger := log.WithField("component", "clear")
20+
1921
var projectPaths []string
2022
var err error
2123
if len(addresses) != 0 {
2224
for _, addr := range addresses {
2325
var project *Project
2426
project, err = CompleteAddrToProject(addr)
2527
if err != nil {
26-
log.Warnf("warning: addr %s occur error: %v\n", addr, err)
28+
logger.Warnf("addr %s occur error: %v", addr, err)
2729
continue
2830
}
2931
projectPaths = append(projectPaths, project.Path)
@@ -60,18 +62,18 @@ func Clear(t time.Duration, yes, force bool, addresses ...string) error {
6062
for _, projectPath := range projectPaths {
6163
isClean, err = IsRepoClean(projectPath)
6264
if err != nil {
63-
log.Warnf("%s isn't a git repo: %v.", projectPath, err)
65+
logger.Warnf("%s isn't a git repo: %v.", projectPath, err)
6466
continue
6567
} else if !isClean {
66-
log.Warnf("%s should be cleared, but there are local changes.", projectPath)
68+
logger.Warnf("%s should be cleared, but there are local changes.", projectPath)
6769
} else {
6870
projectPure = append(projectPure, projectPath)
6971
}
7072
}
7173
projectPaths = projectPure
7274
}
7375
if len(projectPaths) != 0 {
74-
log.Infoln("following projects is going to be cleared.")
76+
logger.Infoln("following projects is going to be cleared.")
7577
fmt.Println(strings.Join(projectPaths, "\n"))
7678

7779
if !yes && !force {
@@ -85,14 +87,14 @@ func Clear(t time.Duration, yes, force bool, addresses ...string) error {
8587
}
8688
}
8789

88-
for _, path := range projectPaths {
89-
if err = os.RemoveAll(path); err != nil {
90-
log.Printf("warning: remove project %s failed: %v", path, err)
90+
for _, projectPath := range projectPaths {
91+
if err = os.RemoveAll(projectPath); err != nil {
92+
logger.Warnf("remove project %s failed: %v", projectPath, err)
9193
}
9294
}
93-
log.Infoln("clean task completed.")
95+
logger.Infoln("clean task completed.")
9496
} else {
95-
log.Infoln("no project to clear.")
97+
logger.Infoln("no project to clear.")
9698
}
9799
return nil
98100
}

internal/pkg/project/project.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func Open(addr string) error {
1616
if err != nil {
1717
return err
1818
}
19-
log.Infof("Opened %s via %s", project.Path, ideaName)
19+
log.WithField("idea", ideaName).Infof("opened %s", project.Path)
2020
return nil
2121
}
2222

0 commit comments

Comments
 (0)