chtwrs/chirpnest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shoopea 2020-01-23 14:10:58 +08:00
parent 8abb3bc2d2
commit ab88067291
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
job.go
View File

@ -1520,21 +1520,17 @@ func jobGWithdraw(j Job) {
} }
} }
m, err := getObjMsg(j.Trigger) p.CleanupMsg = append(p.CleanupMsg, *m)
logOnError(err, "jobGWithdraw : getObjMsg")
if err == nil {
p.CleanupMsg = append(p.CleanupMsg, *m)
}
if isUnique { if isUnique {
for _, req := range p.Items { for _, req := range p.Items {
if req.Inspect { if req.Inspect {
p2 = JobPayloadMsgDel{ p2 := JobPayloadMsgDel{
MsgTypeID64: cacheObjSubType[`msg_g_inspect_req`], MsgTypeID64: cacheObjSubType[`msg_g_inspect_req`],
Delay: (10 * time.Second), Delay: (10 * time.Second),
ObjMsgID64: 0, ObjMsgID64: 0,
} }
b2, _ = json.Marshal(p2) b2, _ := json.Marshal(p2)
createJobCallback(cacheObjSubType[`job_msg_del`], j.UserID64, p2.MsgTypeID64, b2, time.Minute) createJobCallback(cacheObjSubType[`job_msg_del`], j.UserID64, p2.MsgTypeID64, b2, time.Minute)
p.Inspecting = req.Code p.Inspecting = req.Code
@ -1568,20 +1564,16 @@ func jobGWithdraw(j Job) {
} }
p.Inspecting = `` p.Inspecting = ``
m, err := getObjMsg(j.Trigger) p.CleanupMsg = append(p.CleanupMsg, *m)
logOnError(err, "jobGWithdraw : getObjMsg")
if err == nil {
p.CleanupMsg = append(p.CleanupMsg, *m)
}
for _, req := range p.Items { for _, req := range p.Items {
if req.Inspect { if req.Inspect {
p2 = JobPayloadMsgDel{ p2 := JobPayloadMsgDel{
MsgTypeID64: cacheObjSubType[`msg_g_inspect_req`], MsgTypeID64: cacheObjSubType[`msg_g_inspect_req`],
Delay: (10 * time.Second), Delay: (10 * time.Second),
ObjMsgID64: 0, ObjMsgID64: 0,
} }
b2, _ = json.Marshal(p2) b2, _ := json.Marshal(p2)
createJobCallback(cacheObjSubType[`job_msg_del`], j.UserID64, p2.MsgTypeID64, b2, time.Minute) createJobCallback(cacheObjSubType[`job_msg_del`], j.UserID64, p2.MsgTypeID64, b2, time.Minute)
p.Inspecting = req.Code p.Inspecting = req.Code