diff Framework/HttpQueries/HttpQueriesQueue.cpp @ 44:f4e828607f02

Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
author Alain Mazy <am@osimis.io>
date Wed, 19 Oct 2022 21:12:57 +0200
parents 44a0430d7899
children 1e396fb509ca
line wrap: on
line diff
--- a/Framework/HttpQueries/HttpQueriesQueue.cpp	Tue Jul 12 17:49:40 2022 +0200
+++ b/Framework/HttpQueries/HttpQueriesQueue.cpp	Wed Oct 19 21:12:57 2022 +0200
@@ -135,6 +135,9 @@
     {
       query->ReadBody(body);              
     }       
+    
+    std::map<std::string, std::string> headers;
+    query->GetHttpHeaders(headers);
 
     unsigned int retry = 0;
 
@@ -149,19 +152,19 @@
         switch (query->GetMethod())
         {
           case Orthanc::HttpMethod_Get:
-            success = peers_.DoGet(answer, query->GetPeer(), query->GetUri());
+            success = peers_.DoGet(answer, query->GetPeer(), query->GetUri(), headers);
             break;
 
           case Orthanc::HttpMethod_Post:
-            success = peers_.DoPost(answer, query->GetPeer(), query->GetUri(), body);
+            success = peers_.DoPost(answer, query->GetPeer(), query->GetUri(), body, headers);
             break;
 
           case Orthanc::HttpMethod_Put:
-            success = peers_.DoPut(query->GetPeer(), query->GetUri(), body);
+            success = peers_.DoPut(query->GetPeer(), query->GetUri(), body, headers);
             break;
 
           case Orthanc::HttpMethod_Delete:
-            success = peers_.DoDelete(query->GetPeer(), query->GetUri());
+            success = peers_.DoDelete(query->GetPeer(), query->GetUri(), headers);
             break;
 
           default:
@@ -171,7 +174,7 @@
       catch (Orthanc::OrthancException& e)
       {
         LOG(ERROR) << "Unhandled exception during an HTTP query to peer \"" 
-                   << query->GetPeer() << "\": " << e.What();
+                   << query->GetPeer() <<  " " << query->GetUri() + "\": " << e.What();
         success = false;
       }
 
@@ -221,7 +224,10 @@
         }
         else
         {
-          LOG(INFO) << "Reached the maximum number of retries for a HTTP query";
+          if (maxRetries > 0)
+          {
+            LOG(ERROR) << "Reached the maximum number of retries for a HTTP query to peer " << query->GetPeer() <<  " " << query->GetUri();
+          }
 
           {
             boost::mutex::scoped_lock lock(mutex_);