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

fix: 关闭crontask任务异常TaskHandShakeToNF

Browse Source
This commit is contained in:
TsMask
2024-06-20 21:08:22 +08:00
parent 278142dd06
commit e91ec1b9d2
1 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
crontask/tasks.go
View File

@@ -493,59 +493,59 @@ type SystemState struct {
func (t *TaskFunc) TaskHandShakeToNF(uri, params, body string) { func (t *TaskFunc) TaskHandShakeToNF(uri, params, body string) {
log.Debug("TaskHandShakeToNF processing... ") log.Debug("TaskHandShakeToNF processing... ")
var nes []NeInfo // var nes []NeInfo
_, err := XormGetAllNeInfo(&nes) // _, err := XormGetAllNeInfo(&nes)
if err != nil { // if err != nil {
log.Error("Failed to get all ne info:", err) // log.Error("Failed to get all ne info:", err)
} // }
for _, ne := range nes { // for _, ne := range nes {
requestURI := fmt.Sprintf(uri, strings.ToLower(ne.NeType)) // requestURI := fmt.Sprintf(uri, strings.ToLower(ne.NeType))
if params != "" { // if params != "" {
requestURI = fmt.Sprintf("%s?%s", requestURI, params) // requestURI = fmt.Sprintf("%s?%s", requestURI, params)
} // }
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": GetDefaultUserAgent()}). // SetHeaders(map[string]string{"User-Agent": GetDefaultUserAgent()}).
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). // SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
Get(requestURL) // Get(requestURL)
if err != nil { // if err != nil {
log.Error("Failed to Get:", err) // log.Error("Failed to Get:", err)
} // }
log.Debug("StatusCode: ", response.StatusCode()) // log.Debug("StatusCode: ", response.StatusCode())
switch response.StatusCode() { // switch response.StatusCode() {
case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted: // case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted:
log.Debug("response body:", string(response.Body())) // log.Debug("response body:", string(response.Body()))
state := new(SystemState) // state := new(SystemState)
_ = json.Unmarshal(response.Body(), &state) // _ = json.Unmarshal(response.Body(), &state)
neState := new(NeState) // neState := new(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 = state.ExpiryDate
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)
neState.MemUsage = string(mu) // neState.MemUsage = string(mu)
ds, _ := json.Marshal(state.DiskSpace) // ds, _ := json.Marshal(state.DiskSpace)
neState.DiskSpace = string(ds) // neState.DiskSpace = string(ds)
log.Debug("neState:", neState) // log.Debug("neState:", neState)
_, err := XormInsertNeState(neState) // _, err := XormInsertNeState(neState)
if err != nil { // if err != nil {
log.Error("Failed to insert ne_state:", err) // log.Error("Failed to insert ne_state:", err)
} // }
default: // default:
log.Debug("response body:", string(response.Body())) // log.Debug("response body:", string(response.Body()))
body := new(map[string]interface{}) // body := new(map[string]interface{})
_ = json.Unmarshal(response.Body(), &body) // _ = json.Unmarshal(response.Body(), &body)
} // }
} // }
} }
func (t *TaskFunc) TaskExportCmFromNF(uri, params, body string) { func (t *TaskFunc) TaskExportCmFromNF(uri, params, body string) {