Merge remote-tracking branch 'upstream/master'

This commit is contained in:
No-ops 2017-09-29 10:51:16 +02:00
commit 7b6215604e
2 changed files with 3 additions and 0 deletions

View File

@ -228,6 +228,8 @@ func (client *Client) do(funcname string, data []byte,
client.Lock() client.Lock()
defer client.Unlock() defer client.Unlock()
var result = make(chan handleOrError, 1) var result = make(chan handleOrError, 1)
client.Lock()
defer client.Unlock()
client.lastcall = "c" client.lastcall = "c"
client.innerHandler.put("c", func(resp *Response) { client.innerHandler.put("c", func(resp *Response) {
if resp.DataType == dtError { if resp.DataType == dtError {

View File

@ -51,6 +51,7 @@ const (
dtSubmitJobLowBg = 34 dtSubmitJobLowBg = 34
WorkComplate = dtWorkComplete WorkComplate = dtWorkComplete
WorkComplete = dtWorkComplete
WorkData = dtWorkData WorkData = dtWorkData
WorkStatus = dtWorkStatus WorkStatus = dtWorkStatus
WorkWarning = dtWorkWarning WorkWarning = dtWorkWarning