yuxh/gearman-go
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Remove handle only when the job is done

Browse Source 
This commit stops the client from removing the job handle from
client.jobhandlers when the worker has sent an update (e.g. WORK_STATUS)
without terminating its life.

WORK_DATA       |
WORK_WARNING    | => Notification
WORK_STATUS     |

WORK_COMPLETE   |
WORK_FAIL       | => Notification + End of life
WORK_EXCEPTION  |
This commit is contained in:
Jesús García Crespo 2013-11-09 09:27:30 -08:00
parent 2002bb1804
commit adbe320074
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/client.go
View File

@ -213,9 +213,10 @@ func (client *Client) inLoop() {
case common.ERROR: case common.ERROR:
_, err := common.GetError(job.Data) _, err := common.GetError(job.Data)
client.err(err) client.err(err)
case common.WORK_DATA, common.WORK_WARNING, common.WORK_STATUS, case common.WORK_DATA, common.WORK_WARNING, common.WORK_STATUS:
common.WORK_COMPLETE, common.WORK_FAIL, common.WORK_EXCEPTION: client.handleJob(job, false)
client.handleJob(job) case common.WORK_COMPLETE, common.WORK_FAIL, common.WORK_EXCEPTION:
client.handleJob(job, true)
case common.ECHO_RES: case common.ECHO_RES:
client.handleEcho(job) client.handleEcho(job)
case common.JOB_CREATED: case common.JOB_CREATED:
@ -236,12 +237,14 @@ func (client *Client) err (e error) {
} }
// job handler // job handler
func (client *Client) handleJob(job *Job) { func (client *Client) handleJob(job *Job, terminate bool) {
client.mutex.RLock() client.mutex.RLock()
defer client.mutex.RUnlock() defer client.mutex.RUnlock()
if h, ok := client.jobhandlers[job.Handle]; ok { if h, ok := client.jobhandlers[job.Handle]; ok {
h(job) h(job)
delete(client.jobhandlers, job.Handle) if terminate {
delete(client.jobhandlers, job.Handle)
}
} }
} }