hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed sync bug in HTTP trigger handler

Browse source
This commit is contained in:
Thulinma 2019-03-26 16:19:48 +01:00
parent f77f1bc14d
commit cdc8f0179f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/downloader.cpp
View file

@ -200,8 +200,8 @@ namespace HTTP{
MEDIUM_MSG("Posting to %s (%zu/%" PRIu32 ")", link.getUrl().c_str(), retryCount - loop + 1, MEDIUM_MSG("Posting to %s (%zu/%" PRIu32 ")", link.getUrl().c_str(), retryCount - loop + 1,
retryCount); retryCount);
doRequest(link, "POST", payload); doRequest(link, "POST", payload);
// Not synced? Ignore the response and immediately return false. // Not synced? Ignore the response and immediately return true.
if (!sync){return false;} if (!sync){return true;}
uint64_t reqTime = Util::bootSecs(); uint64_t reqTime = Util::bootSecs();
while (getSocket() && Util::bootSecs() < reqTime + dataTimeout){ while (getSocket() && Util::bootSecs() < reqTime + dataTimeout){
// No data? Wait for a second or so. // No data? Wait for a second or so.

2
lib/triggers.cpp
View file

@ -54,7 +54,7 @@ namespace Triggers{
DL.setHeader("X-Trigger", trigger); DL.setHeader("X-Trigger", trigger);
DL.setHeader("Content-Type", "text/plain"); DL.setHeader("Content-Type", "text/plain");
HTTP::URL url(value); HTTP::URL url(value);
if (DL.post(url, payload, sync) && sync && DL.isOk()){ if (DL.post(url, payload, sync) && (!sync || DL.isOk())){
submitTriggerStat(trigger, tStartMs, true); submitTriggerStat(trigger, tStartMs, true);
return DL.data(); return DL.data();
} }