feat: adjust application variable init (#708)

douyu · Feb 8, 2023 · c7f62df · c7f62df
1 parent dd467f0
commit c7f62df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pkg/env.go b/pkg/env.go
@@ -21,7 +21,6 @@ var (
 )
 
 func InitEnv() {
-	appID = os.Getenv(constant.EnvAppID)
 	appLogDir = os.Getenv(constant.EnvAppLogDir)
 	appMode = os.Getenv(constant.EnvAppMode)
 	appRegion = os.Getenv(constant.EnvAppRegion)

diff --git a/pkg/pkg.go b/pkg/pkg.go
@@ -55,7 +55,12 @@ func init() {
 			appName = filepath.Base(os.Args[0])
 		}
 	}
-
+	if appID == "" {
+		appID = os.Getenv(constant.EnvAppID)
+		if appID == "" {
+			appID = "1234567890"
+		}
+	}
 	name, err := os.Hostname()
 	if err != nil {
 		name = "unknown"
@@ -79,9 +84,6 @@ func SetName(s string) {
 
 // AppID get appID
 func AppID() string {
-	if appID == "" {
-		return "1234567890" //default appid when APP_ID Env var not set
-	}
 	return appID
 }