Parcourir la source

Fixed #TSB-1234 test

ilucky.si il y a 1 an
Parent
commit
f027f13c79
4 fichiers modifiés avec 30 ajouts et 11 suppressions
  1. 9 9
      config/config.go
  2. 11 0
      containers/registry.go
  3. 1 1
      euspace.conf
  4. 9 1
      main.go

+ 9 - 9
config/config.go

@@ -15,21 +15,21 @@ type AgentConfig struct {
 }
 
 type ServerConfig struct {
-	ConfigServer string
-	DataServer   string
-	License      string
+	ConfigServer string `ini:"ConfigServer"`
+	DataServer   string `ini:"DataServer"`
+	License      string `ini:"License"`
 }
 
 type ResourceConfig struct {
-	ResourceMaxProcess int
+	ResourceMaxProcs int `ini:"resource.maxProcs"`
 }
 
 type LogConfig struct {
-	LogLevel            string
-	LogPath             string
-	LogFileSize         int
-	LogReserveDay       int
-	LogMaxReserveOneday int
+	LogLevel            string `ini:"log.level"`
+	LogPath             string `ini:"log.path"`
+	LogFileSize         int    `ini:"log.fileSize"`
+	LogReserveDay       int    `ini:"log.reserveDay"`
+	LogMaxReserveOneday int    `ini:"log.maxReserveOneday"`
 }
 
 func getCurrentDirectory() (string, error) {

+ 11 - 0
containers/registry.go

@@ -122,6 +122,12 @@ func NewRegistry(reg prometheus.Registerer, kernelVersion string, agentConfig *c
 		return nil, err
 	}
 
+	// IK:PR: 解析LicenseKey
+	err = r.parseLicenseKey()
+	if err != nil {
+		return nil, err
+	}
+
 	// IK:PR: 注册主机逻辑/阻塞
 	// r.registerHost()
 
@@ -137,6 +143,11 @@ func NewRegistry(reg prometheus.Registerer, kernelVersion string, agentConfig *c
 	return r, nil
 }
 
+func (r *Registry) parseLicenseKey() error {
+	// licenseKey := r.agentConfig.ServerConfig.License
+	return nil
+}
+
 func (r *Registry) Describe(ch chan<- *prometheus.Desc) {
 	ch <- metrics.Ip2Fqdn
 }

+ 1 - 1
euspace.conf

@@ -4,7 +4,7 @@ DataServer=http://10.0.12.192:18080
 License=J45Engw88NeHUZ4Q7qNsK8L47FTH**QvgW113IEnsNaBNMR5zZ**oj/g!!!!
 
 [resource]
-resource.maxProcsess=1
+resource.maxProcs=1
 
 [log]
 ; default log level is info

+ 9 - 1
main.go

@@ -117,8 +117,16 @@ func main() {
 	}
 	fmt.Printf("License=%+v\r\n", agentConfig)
 
+	// IK: 限制资源
+	maxProcs := agentConfig.ResourceConfig.ResourceMaxProcs
+	if maxProcs <= 0 {
+		maxProcs = 1
+	}
+	runtime.GOMAXPROCS(maxProcs)
+
+	// IK: 初始化日志组件, klog是将日志以http方式发送到server端, 支持配置LogPerSecond等配置.
 	klog.LogToStderr(false)
-	klog.SetOutput(&RateLimitedLogOutput{limiter: rate.NewLimiter(rate.Limit(*flags.LogPerSecond), *flags.LogBurst)}) // IK: 初始化日志组件...
+	klog.SetOutput(&RateLimitedLogOutput{limiter: rate.NewLimiter(rate.Limit(*flags.LogPerSecond), *flags.LogBurst)})
 
 	klog.Infoln("agent version:", version)