YAO/YAO-scheduler
1
0
Fork 0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-12-13 07:46:43 +00:00
Code Issues Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Newnius
2019-11-11 15:33:04 +08:00
parent 0abda954c8
commit ea5ce278ca
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/job_manager.go
View File

@@ -66,21 +66,21 @@ func (jm *JobManager) start() {
resp, err := doRequest("POST", "http://"+jm.resources[i].ClientHost+":8000/create", strings.NewReader(v.Encode()), "application/x-www-form-urlencoded", "")
if err != nil {
log.Warn(err.Error())
return
continue
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
resp.Body.Close()
if err != nil {
log.Warn(err)
return
continue
}
var res MsgCreate
err = json.Unmarshal([]byte(string(body)), &res)
if err != nil {
log.Warn(err)
return
continue
}
jm.jobStatus.tasks[jm.job.Tasks[i].Name] = TaskStatus{Id: res.Id, Node: jm.resources[i].ClientHost}
@@ -160,9 +160,8 @@ func (jm *JobManager) status() MsgJobStatus {
}
resp := spider.getResponse()
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
resp.Body.Close()
if err != nil {
continue
}
@@ -180,10 +179,15 @@ func (jm *JobManager) status() MsgJobStatus {
func (jm *JobManager) stop() MsgStop {
for _, taskStatus := range jm.jobStatus.tasks {
spider := Spider{}
spider.Method = "POST"
spider.URL = "http://" + taskStatus.Node + ":8000/stop?id=" + taskStatus.Id
spider.do()
v := url.Values{}
v.Set("id", taskStatus.Id)
_, err := doRequest("POST", "http://"+taskStatus.Node+":8000/stop", strings.NewReader(v.Encode()), "application/x-www-form-urlencoded", "")
if err != nil {
log.Warn(err.Error())
continue
}
}
for i := range jm.resources {

2
src/main.go
View File

@@ -8,7 +8,7 @@ import (
"os"
)
var addr = flag.String("addr", "127.0.0.1:8080", "http service address")
var addr = flag.String("addr", "0.0.0.0:8080", "http service address")
var confFile = flag.String("conf", "/etc/yao/config.json", "configuration file path")
var pool *ResourcePool