fix log appid

Verlaski · Apr 11, 2019 · 82f27d7 · 82f27d7
1 parent dbdfe47
commit 82f27d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 go.sum
+tool/kratos/kratos
diff --git a/pkg/log/log.go b/pkg/log/log.go
@@ -13,8 +13,8 @@ import (
 
 // Config log config.
 type Config struct {
-	Family string
-	Host   string
+	AppID string
+	Host  string
 
 	// stdout
 	Stdout bool
@@ -94,8 +94,8 @@ func Init(conf *Config) {
 			Filter: _filter,
 		}
 	}
-	if len(env.AppID) != 0 {
-		conf.Family = env.AppID // for caster
+	if conf.AppID == "" && len(env.AppID) != 0 {
+		conf.AppID = env.AppID
 	}
 	conf.Host = env.Hostname
 	if len(conf.Host) == 0 {

diff --git a/pkg/log/util.go b/pkg/log/util.go
@@ -30,7 +30,7 @@ func addExtraField(ctx context.Context, fields map[string]interface{}) {
 	}
 	fields[_deplyEnv] = env.DeployEnv
 	fields[_zone] = env.Zone
-	fields[_appID] = c.Family
+	fields[_appID] = c.AppID
 	fields[_instanceID] = c.Host
 	if metadata.Bool(ctx, metadata.Mirror) {
 		fields[_mirror] = true