From abd437ba60cba0623c775e25832f9d7dc81fc67c Mon Sep 17 00:00:00 2001 From: shoopea Date: Fri, 7 Feb 2020 12:05:01 +0800 Subject: [PATCH] fix delay in jobs --- job.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/job.go b/job.go index 1cd0d98..44fd4a4 100644 --- a/job.go +++ b/job.go @@ -2301,7 +2301,7 @@ 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 setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_shop_main_req`]) setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_shop_main_ack`]) - clientSendCWMsgDelay(j.UserID64, fmt.Sprintf("/ws_%s", p.Shops[0]), 6) + clientSendCWMsgDelay(j.UserID64, fmt.Sprintf("/ws_%s", p.Shops[0]), 6*time.Second) return } @@ -2413,7 +2413,7 @@ func jobGetVault(j Job) { setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_gstock_res_req`]) setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_gstock_any_ack`]) rescheduleJob(j.ID64, 0, time.Unix(maxUnixTimestamp, 0).UTC()) - clientSendCWMsgDelay(j.UserID64, `/g_stock_res`, 4) + clientSendCWMsgDelay(j.UserID64, `/g_stock_res`, 4*time.Second) return } else if (p.Status & reqTab[cacheObjSubType[`item_alch`]]) == reqTab[cacheObjSubType[`item_alch`]] { p.Status = p.Status &^ reqTab[cacheObjSubType[`item_alch`]] @@ -2422,7 +2422,7 @@ func jobGetVault(j Job) { setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_gstock_alch_req`]) setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_gstock_any_ack`]) rescheduleJob(j.ID64, 0, time.Unix(maxUnixTimestamp, 0).UTC()) - clientSendCWMsgDelay(j.UserID64, `/g_stock_alch`, 4) + clientSendCWMsgDelay(j.UserID64, `/g_stock_alch`, 4*time.Second) return } else if (p.Status & reqTab[cacheObjSubType[`item_misc`]]) == reqTab[cacheObjSubType[`item_misc`]] { p.Status = p.Status &^ reqTab[cacheObjSubType[`item_misc`]] @@ -2431,7 +2431,7 @@ func jobGetVault(j Job) { setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_gstock_misc_req`]) setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_gstock_any_ack`]) rescheduleJob(j.ID64, 0, time.Unix(maxUnixTimestamp, 0).UTC()) - clientSendCWMsgDelay(j.UserID64, `/g_stock_misc`, 4) + clientSendCWMsgDelay(j.UserID64, `/g_stock_misc`, 4*time.Second) return } else if (p.Status & reqTab[cacheObjSubType[`item_recipe`]]) == reqTab[cacheObjSubType[`item_recipe`]] { p.Status = p.Status &^ reqTab[cacheObjSubType[`item_recipe`]] @@ -2440,7 +2440,7 @@ func jobGetVault(j Job) { setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_gstock_rec_req`]) setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_gstock_any_ack`]) rescheduleJob(j.ID64, 0, time.Unix(maxUnixTimestamp, 0).UTC()) - clientSendCWMsgDelay(j.UserID64, `/g_stock_rec`, 4) + clientSendCWMsgDelay(j.UserID64, `/g_stock_rec`, 4*time.Second) return } else if (p.Status & reqTab[cacheObjSubType[`item_part`]]) == reqTab[cacheObjSubType[`item_part`]] { p.Status = p.Status &^ reqTab[cacheObjSubType[`item_part`]] @@ -2449,7 +2449,7 @@ func jobGetVault(j Job) { setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_gstock_part_req`]) setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_gstock_any_ack`]) rescheduleJob(j.ID64, 0, time.Unix(maxUnixTimestamp, 0).UTC()) - clientSendCWMsgDelay(j.UserID64, `/g_stock_parts`, 4) + clientSendCWMsgDelay(j.UserID64, `/g_stock_parts`, 4*time.Second) return } else if (p.Status & reqTab[cacheObjSubType[`item_other`]]) == reqTab[cacheObjSubType[`item_other`]] { p.Status = p.Status &^ reqTab[cacheObjSubType[`item_other`]] @@ -2458,7 +2458,7 @@ func jobGetVault(j Job) { setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_gstock_oth_req`]) setJobCallback(j.ID64, j.UserID64, cacheObjSubType[`msg_gstock_any_ack`]) rescheduleJob(j.ID64, 0, time.Unix(maxUnixTimestamp, 0).UTC()) - clientSendCWMsgDelay(j.UserID64, `/g_stock_other`, 4) + clientSendCWMsgDelay(j.UserID64, `/g_stock_other`, 4*time.Second) return } else { setJobPayloadJSON(j.ID64, p)