From c3e7844c81166b36827156ce9232c717e6e3658a Mon Sep 17 00:00:00 2001 From: shoopea Date: Tue, 11 Feb 2020 10:14:42 +0800 Subject: [PATCH] fix job slaves shop --- job.go | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/job.go b/job.go index 17f99d4..a6961b8 100644 --- a/job.go +++ b/job.go @@ -2327,15 +2327,6 @@ func jobShopsSlave(j Job) { rescheduleJob(j.ID64, 0, time.Unix(maxUnixTimestamp, 0).UTC()) // reschedule so that it gets picked up by shop main ack callback return case cacheObjSubType[`msg_unknown_action`]: - muxObjJob.Lock() - b2 := getJobPayloadUnsafe(p.JobCallbackID64) - var p2 JobPayloadShops - err = json.Unmarshal(b2, &p2) - p2.Msgs = append(p2.Msgs, *m) - err = setJobPayloadJSONUnsafe(p.JobCallbackID64, p2) - logOnError(err, "jobShopsSlave : setJobPayloadJSONUnsafe") - muxObjJob.Unlock() - c := TGCommand{ Type: commandReplyMsg, Text: fmt.Sprintf("Unknown shop /ws_%s\n", p.Shops[0]), @@ -2345,14 +2336,8 @@ func jobShopsSlave(j Job) { } TGCmdQueue <- c - p.Shops = append(p.Shops[:0], p.Shops[1:]...) - - err = setJobPayloadJSON(j.ID64, p) - logOnError(err, "jobShopsSlave : setJobPayloadJSON") + fallthrough case cacheObjSubType[`msg_shop_main_ack`]: - cwm, err := parseSubTypeMessageShopMainAck(m, rule.re) - logOnError(err, "jobShopsSlave : parseSubTypeMessageShopMainAck") - muxObjJob.Lock() b2 := getJobPayloadUnsafe(p.JobCallbackID64) var p2 JobPayloadShops