OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 不能周期启动getStateFromNE

Browse Source
This commit is contained in:
simonzhangsz
2024-01-05 20:01:43 +08:00
parent 3cd8dd70a7
commit fcc6aa8c68
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/modules/crontask/processor/getStateFromNE/getStateFromNE.go
View File

@@ -10,6 +10,7 @@ import (
"ems.agt/lib/dborm" "ems.agt/lib/dborm"
"ems.agt/lib/log" "ems.agt/lib/log"
"ems.agt/restagent/config" "ems.agt/restagent/config"
"ems.agt/src/framework/cron"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
) )
@@ -68,36 +69,22 @@ type SystemState struct {
var client = resty.New() var client = resty.New()
func init() { func init() {
/*
client.
SetTimeout(10 * time.Second).
SetRetryCount(1).
SetRetryWaitTime(1 * time.Second).
SetRetryMaxWaitTime(2 * time.Second).
SetRetryAfter(func(client *resty.Client, resp *resty.Response) (time.Duration, error) {
return 0, errors.New("quota exceeded")
})
*/
client. client.
SetTimeout(time.Duration(400 * time.Millisecond)) SetTimeout(time.Duration(400 * time.Millisecond))
// SetRetryCount(1).
// SetRetryWaitTime(time.Duration(1 * time.Second)).
// SetRetryMaxWaitTime(time.Duration(2 * time.Second))
//client.SetTimeout(2 * time.Second)
} }
func (s *BarProcessor) Execute(data any) (any, error) { func (s *BarProcessor) Execute(data any) (any, error) {
var err error var err error
s.count++ s.count++
// options := data.(cron.JobData) options := data.(cron.JobData)
// // sysJob := options.SysJob sysJob := options.SysJob
// // var params BarParams var params BarParams
// // // err := json.Unmarshal([]byte(sysJob.TargetParams), &params) _ = json.Unmarshal([]byte(sysJob.TargetParams), &params)
// // // if err == nil { // if err == nil {
// // // duration = params.Duration // duration = params.Duration
// // // } // }
var nes []dborm.NeInfo var nes []dborm.NeInfo
_, err = dborm.XormGetAllNeInfo(&nes) _, err = dborm.XormGetAllNeInfo(&nes)
@@ -112,7 +99,7 @@ func (s *BarProcessor) Execute(data any) (any, error) {
requestURI := fmt.Sprintf("/api/rest/systemManagement/v1/elementType/%s/objectType/systemState", strings.ToLower(ne.NeType)) requestURI := fmt.Sprintf("/api/rest/systemManagement/v1/elementType/%s/objectType/systemState", strings.ToLower(ne.NeType))
requestURL := fmt.Sprintf("http://%s:%s%s", ne.Ip, ne.Port, requestURI) requestURL := fmt.Sprintf("http://%s:%s%s", ne.Ip, ne.Port, requestURI)
log.Debug("requestURL: Get", requestURL) log.Debug("requestURL: Get", requestURL)
client := resty.New() //client := resty.New()
response, err := client.R(). response, err := client.R().
EnableTrace(). EnableTrace().
SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
@@ -130,13 +117,17 @@ func (s *BarProcessor) Execute(data any) (any, error) {
log.Trace("response body:", string(response.Body())) log.Trace("response body:", string(response.Body()))
state := new(SystemState) state := new(SystemState)
_ = json.Unmarshal(response.Body(), &state) _ = json.Unmarshal(response.Body(), &state)
var dateStr *string = nil
if state.ExpiryDate != "" {
dateStr = &state.ExpiryDate
}
neState := new(dborm.NeState) neState := new(dborm.NeState)
neState.NeType = ne.NeType neState.NeType = ne.NeType
neState.NeId = ne.NeId neState.NeId = ne.NeId
neState.Version = state.Version neState.Version = state.Version
neState.Capability = state.Capability neState.Capability = state.Capability
neState.SerialNum = state.SerialNum neState.SerialNum = state.SerialNum
neState.ExpiryDate = state.ExpiryDate neState.ExpiryDate = *dateStr
cu, _ := json.Marshal(state.CpuUsage) cu, _ := json.Marshal(state.CpuUsage)
neState.CpuUsage = string(cu) neState.CpuUsage = string(cu)
mu, _ := json.Marshal(state.MemUsage) mu, _ := json.Marshal(state.MemUsage)