fix: 关闭crontask任务异常TaskHandShakeToNF
This commit is contained in:
@@ -493,59 +493,59 @@ type SystemState struct {
|
||||
func (t *TaskFunc) TaskHandShakeToNF(uri, params, body string) {
|
||||
log.Debug("TaskHandShakeToNF processing... ")
|
||||
|
||||
var nes []NeInfo
|
||||
_, err := XormGetAllNeInfo(&nes)
|
||||
if err != nil {
|
||||
log.Error("Failed to get all ne info:", err)
|
||||
}
|
||||
// var nes []NeInfo
|
||||
// _, err := XormGetAllNeInfo(&nes)
|
||||
// if err != nil {
|
||||
// log.Error("Failed to get all ne info:", err)
|
||||
// }
|
||||
|
||||
for _, ne := range nes {
|
||||
requestURI := fmt.Sprintf(uri, strings.ToLower(ne.NeType))
|
||||
if params != "" {
|
||||
requestURI = fmt.Sprintf("%s?%s", requestURI, params)
|
||||
}
|
||||
requestURL := fmt.Sprintf("http://%s:%s%s", ne.Ip, ne.Port, requestURI)
|
||||
log.Debug("requestURL: Get", requestURL)
|
||||
client := resty.New()
|
||||
response, err := client.R().
|
||||
EnableTrace().
|
||||
SetHeaders(map[string]string{"User-Agent": GetDefaultUserAgent()}).
|
||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||
Get(requestURL)
|
||||
if err != nil {
|
||||
log.Error("Failed to Get:", err)
|
||||
}
|
||||
// for _, ne := range nes {
|
||||
// requestURI := fmt.Sprintf(uri, strings.ToLower(ne.NeType))
|
||||
// if params != "" {
|
||||
// requestURI = fmt.Sprintf("%s?%s", requestURI, params)
|
||||
// }
|
||||
// requestURL := fmt.Sprintf("http://%s:%s%s", ne.Ip, ne.Port, requestURI)
|
||||
// log.Debug("requestURL: Get", requestURL)
|
||||
// client := resty.New()
|
||||
// response, err := client.R().
|
||||
// EnableTrace().
|
||||
// SetHeaders(map[string]string{"User-Agent": GetDefaultUserAgent()}).
|
||||
// SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||
// Get(requestURL)
|
||||
// if err != nil {
|
||||
// log.Error("Failed to Get:", err)
|
||||
// }
|
||||
|
||||
log.Debug("StatusCode: ", response.StatusCode())
|
||||
switch response.StatusCode() {
|
||||
case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted:
|
||||
log.Debug("response body:", string(response.Body()))
|
||||
state := new(SystemState)
|
||||
_ = json.Unmarshal(response.Body(), &state)
|
||||
neState := new(NeState)
|
||||
neState.NeType = ne.NeType
|
||||
neState.NeId = ne.NeId
|
||||
neState.Version = state.Version
|
||||
neState.Capability = state.Capability
|
||||
neState.SerialNum = state.SerialNum
|
||||
neState.ExpiryDate = state.ExpiryDate
|
||||
cu, _ := json.Marshal(state.CpuUsage)
|
||||
neState.CpuUsage = string(cu)
|
||||
mu, _ := json.Marshal(state.MemUsage)
|
||||
neState.MemUsage = string(mu)
|
||||
ds, _ := json.Marshal(state.DiskSpace)
|
||||
neState.DiskSpace = string(ds)
|
||||
log.Debug("neState:", neState)
|
||||
_, err := XormInsertNeState(neState)
|
||||
if err != nil {
|
||||
log.Error("Failed to insert ne_state:", err)
|
||||
}
|
||||
default:
|
||||
log.Debug("response body:", string(response.Body()))
|
||||
body := new(map[string]interface{})
|
||||
_ = json.Unmarshal(response.Body(), &body)
|
||||
}
|
||||
}
|
||||
// log.Debug("StatusCode: ", response.StatusCode())
|
||||
// switch response.StatusCode() {
|
||||
// case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted:
|
||||
// log.Debug("response body:", string(response.Body()))
|
||||
// state := new(SystemState)
|
||||
// _ = json.Unmarshal(response.Body(), &state)
|
||||
// neState := new(NeState)
|
||||
// neState.NeType = ne.NeType
|
||||
// neState.NeId = ne.NeId
|
||||
// neState.Version = state.Version
|
||||
// neState.Capability = state.Capability
|
||||
// neState.SerialNum = state.SerialNum
|
||||
// neState.ExpiryDate = state.ExpiryDate
|
||||
// cu, _ := json.Marshal(state.CpuUsage)
|
||||
// neState.CpuUsage = string(cu)
|
||||
// mu, _ := json.Marshal(state.MemUsage)
|
||||
// neState.MemUsage = string(mu)
|
||||
// ds, _ := json.Marshal(state.DiskSpace)
|
||||
// neState.DiskSpace = string(ds)
|
||||
// log.Debug("neState:", neState)
|
||||
// _, err := XormInsertNeState(neState)
|
||||
// if err != nil {
|
||||
// log.Error("Failed to insert ne_state:", err)
|
||||
// }
|
||||
// default:
|
||||
// log.Debug("response body:", string(response.Body()))
|
||||
// body := new(map[string]interface{})
|
||||
// _ = json.Unmarshal(response.Body(), &body)
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
func (t *TaskFunc) TaskExportCmFromNF(uri, params, body string) {
|
||||
|
||||
Reference in New Issue
Block a user