Skip to content
Snippets Groups Projects
Commit 429729b5 authored by Rider Linden's avatar Rider Linden
Browse files

MAINT-5804, MAINT-5890: Incorrectly trapping timeout in event poll and...

MAINT-5804, MAINT-5890: Incorrectly trapping timeout in event poll and canceling coroutine before it's finished.
parent 4676db63
No related branches found
No related tags found
No related merge requests found
...@@ -168,9 +168,9 @@ namespace Details ...@@ -168,9 +168,9 @@ namespace Details
if (!status) if (!status)
{ {
if (status == LLCore::HttpStatus(HTTP_BAD_GATEWAY)) if (status == LLCore::HttpStatus(LLCore::HttpStatus::EXT_CURL_EASY, CURLE_OPERATION_TIMEDOUT))
{ // A HTTP_BAD_GATEWAY (502) error is our standard timeout response { // A standard timeout response we get this when there are no events.
// we get this when there are no events. LL_INFOS("LLEventPollImpl") << "All is very quiet on target server. It may have gone idle?" << LL_ENDL;
errorCount = 0; errorCount = 0;
continue; continue;
} }
...@@ -180,7 +180,7 @@ namespace Details ...@@ -180,7 +180,7 @@ namespace Details
// some cases the server gets ahead of the viewer and will // some cases the server gets ahead of the viewer and will
// return a 404 error (Not Found) before the cancel event // return a 404 error (Not Found) before the cancel event
// comes back in the queue // comes back in the queue
LL_WARNS() << "Canceling coroutine" << LL_ENDL; LL_WARNS("LLEventPollImpl") << "Canceling coroutine" << LL_ENDL;
break; break;
} }
else if (!status.isHttpStatus()) else if (!status.isHttpStatus())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment