Skip to content

Commit 8f828e2

Browse files
TrifleMichaeldavidrohr
authored andcommitted
Signaling content not retreived on any transfer finished error
1 parent a985fe9 commit 8f828e2

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

CCDB/src/CCDBDownloader.cxx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ void CCDBDownloader::transferFinished(CURL* easy_handle, CURLcode curlCode)
485485
bool contentRetrieved = false;
486486

487487
if (curlCode != 0) {
488-
LOG(error) << "CCDBDownloader: " << curl_easy_strerror(curlCode) << "\n";
488+
LOG(error) << "CCDBDownloader CURL transfer error - " << curl_easy_strerror(curlCode) << "\n";
489489
}
490490

491491
switch (performData->type) {
@@ -520,15 +520,14 @@ void CCDBDownloader::transferFinished(CURL* easy_handle, CURLcode curlCode)
520520
} else if (300 <= httpCode && httpCode < 400 && performData->locInd < locations.size()) {
521521
followRedirect(performData, easy_handle, locations, rescheduled, contentRetrieved);
522522
} else if (200 <= httpCode && httpCode < 300) {
523-
contentRetrieved = true; // Can be overruled by following timeout check
523+
contentRetrieved = true; // Can be overruled by following error check
524524
}
525525
} else {
526526
LOG(error) << loggingMessage;
527527
}
528528

529-
// Check for timeout
530-
if (curlCode == CURLE_OPERATION_TIMEDOUT) {
531-
LOG(error) << "Connection timed out.\n";
529+
// Check for errors
530+
if (curlCode != 0) {
532531
contentRetrieved = false;
533532
}
534533

0 commit comments

Comments
 (0)