Enhance the global config initialization (#162)

gorexlv · web-flow · commit e4bd5dc806c9 · 2020-06-24T13:19:50.000+08:00
diff --git a/api/init.go b/api/init.go
@@ -21,6 +21,20 @@ func Init(configPath string) error {
 	return initSentinel(configPath)
 }
 
+// InitCoreComponents init core components with default config
+// it's better SetDefaultConfig before InitCoreComponents
+func InitCoreComponents() (err error) {
+	if err = metric.InitTask(); err != nil {
+		return err
+	}
+
+	system.InitCollector(config.SystemStatCollectIntervalMs())
+	if config.UseCacheTime() {
+		util.StartTimeTicker()
+	}
+	return err
+}
+
 func initSentinel(configPath string) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
@@ -35,17 +49,5 @@ func initSentinel(configPath string) (err error) {
 	if err = config.InitConfig(configPath); err != nil {
 		return err
 	}
-	return initCoreComponents()
-}
-
-func initCoreComponents() (err error) {
-	if err = metric.InitTask(); err != nil {
-		return err
-	}
-
-	system.InitCollector(config.SystemStatCollectIntervalMs())
-	if config.UseCacheTime() {
-		util.StartTimeTicker()
-	}
-	return err
+	return InitCoreComponents()
 }
diff --git a/core/config/config.go b/core/config/config.go
@@ -19,6 +19,10 @@ var (
 	initLogOnce sync.Once
 )
 
+func SetDefaultConfig(config *Entity) {
+	globalCfg = config
+}
+
 // InitConfig loads general configuration from the given file.
 func InitConfig(configPath string) error {
 	// Priority: system environment > YAML file > default config
@@ -149,38 +153,38 @@ func GetDefaultLogDir() string {
 }
 
 func AppName() string {
-	return globalCfg.Sentinel.App.Name
+	return globalCfg.AppName()
 }
 
 func AppType() int32 {
-	return globalCfg.Sentinel.App.Type
+	return globalCfg.AppType()
 }
 
 func LogBaseDir() string {
-	return globalCfg.Sentinel.Log.Dir
+	return globalCfg.LogBaseDir()
 }
 
 // LogUsePid returns whether the log file name contains the PID suffix.
 func LogUsePid() bool {
-	return globalCfg.Sentinel.Log.UsePid
+	return globalCfg.LogUsePid()
 }
 
 func MetricLogFlushIntervalSec() uint32 {
-	return globalCfg.Sentinel.Log.Metric.FlushIntervalSec
+	return globalCfg.MetricLogFlushIntervalSec()
 }
 
 func MetricLogSingleFileMaxSize() uint64 {
-	return globalCfg.Sentinel.Log.Metric.SingleFileMaxSize
+	return globalCfg.MetricLogSingleFileMaxSize()
 }
 
 func MetricLogMaxFileAmount() uint32 {
-	return globalCfg.Sentinel.Log.Metric.MaxFileCount
+	return globalCfg.MetricLogMaxFileAmount()
 }
 
 func SystemStatCollectIntervalMs() uint32 {
-	return globalCfg.Sentinel.Stat.System.CollectIntervalMs
+	return globalCfg.SystemStatCollectIntervalMs()
 }
 
 func UseCacheTime() bool {
-	return globalCfg.Sentinel.UseCacheTime
+	return globalCfg.UseCacheTime()
 }
diff --git a/core/config/entity.go b/core/config/entity.go
@@ -105,3 +105,40 @@ func checkValid(conf *SentinelConfig) error {
 	}
 	return nil
 }
+
+func (entity *Entity) AppName() string {
+	return entity.Sentinel.App.Name
+}
+
+func (entity *Entity) AppType() int32 {
+	return entity.Sentinel.App.Type
+}
+
+func (entity *Entity) LogBaseDir() string {
+	return entity.Sentinel.Log.Dir
+}
+
+// LogUsePid returns whether the log file name contains the PID suffix.
+func (entity *Entity) LogUsePid() bool {
+	return entity.Sentinel.Log.UsePid
+}
+
+func (entity *Entity) MetricLogFlushIntervalSec() uint32 {
+	return entity.Sentinel.Log.Metric.FlushIntervalSec
+}
+
+func (entity *Entity) MetricLogSingleFileMaxSize() uint64 {
+	return entity.Sentinel.Log.Metric.SingleFileMaxSize
+}
+
+func (entity *Entity) MetricLogMaxFileAmount() uint32 {
+	return entity.Sentinel.Log.Metric.MaxFileCount
+}
+
+func (entity *Entity) SystemStatCollectIntervalMs() uint32 {
+	return entity.Sentinel.Stat.System.CollectIntervalMs
+}
+
+func (entity *Entity) UseCacheTime() bool {
+	return entity.Sentinel.UseCacheTime
+}

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@ var (`
`19`	`19`	`initLogOnce sync.Once`
`20`	`20`	`)`
`21`	`21`
	`22`	`+func SetDefaultConfig(config *Entity) {`
	`23`	`+ globalCfg = config`
	`24`	`+}`
	`25`	`+`
`22`	`26`	`// InitConfig loads general configuration from the given file.`
`23`	`27`	`func InitConfig(configPath string) error {`
`24`	`28`	`// Priority: system environment > YAML file > default config`
`@@ -149,38 +153,38 @@ func GetDefaultLogDir() string {`
`149`	`153`	`}`
`150`	`154`
`151`	`155`	`func AppName() string {`
`152`		`- return globalCfg.Sentinel.App.Name`
	`156`	`+ return globalCfg.AppName()`
`153`	`157`	`}`
`154`	`158`
`155`	`159`	`func AppType() int32 {`
`156`		`- return globalCfg.Sentinel.App.Type`
	`160`	`+ return globalCfg.AppType()`
`157`	`161`	`}`
`158`	`162`
`159`	`163`	`func LogBaseDir() string {`
`160`		`- return globalCfg.Sentinel.Log.Dir`
	`164`	`+ return globalCfg.LogBaseDir()`
`161`	`165`	`}`
`162`	`166`
`163`	`167`	`// LogUsePid returns whether the log file name contains the PID suffix.`
`164`	`168`	`func LogUsePid() bool {`
`165`		`- return globalCfg.Sentinel.Log.UsePid`
	`169`	`+ return globalCfg.LogUsePid()`
`166`	`170`	`}`
`167`	`171`
`168`	`172`	`func MetricLogFlushIntervalSec() uint32 {`
`169`		`- return globalCfg.Sentinel.Log.Metric.FlushIntervalSec`
	`173`	`+ return globalCfg.MetricLogFlushIntervalSec()`
`170`	`174`	`}`
`171`	`175`
`172`	`176`	`func MetricLogSingleFileMaxSize() uint64 {`
`173`		`- return globalCfg.Sentinel.Log.Metric.SingleFileMaxSize`
	`177`	`+ return globalCfg.MetricLogSingleFileMaxSize()`
`174`	`178`	`}`
`175`	`179`
`176`	`180`	`func MetricLogMaxFileAmount() uint32 {`
`177`		`- return globalCfg.Sentinel.Log.Metric.MaxFileCount`
	`181`	`+ return globalCfg.MetricLogMaxFileAmount()`
`178`	`182`	`}`
`179`	`183`
`180`	`184`	`func SystemStatCollectIntervalMs() uint32 {`
`181`		`- return globalCfg.Sentinel.Stat.System.CollectIntervalMs`
	`185`	`+ return globalCfg.SystemStatCollectIntervalMs()`
`182`	`186`	`}`
`183`	`187`
`184`	`188`	`func UseCacheTime() bool {`
`185`		`- return globalCfg.Sentinel.UseCacheTime`
	`189`	`+ return globalCfg.UseCacheTime()`
`186`	`190`	`}`