From e3cdaafd88884af9d03fa7a949b379344cd0b145 Mon Sep 17 00:00:00 2001
From: Th3maz1ng <re.hertz@laposte.net>
Date: Sat, 9 Apr 2022 19:10:18 +0200
Subject: [PATCH] Updated the sendHttpQuery method to now return an error code
 which tells the line corresponding to the return of the failure

---
 src/app/HttpClient.cpp | 18 +++++++++---------
 src/app/HttpClient.h   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/HttpClient.cpp b/src/app/HttpClient.cpp
index b56438f..db485c7 100644
--- a/src/app/HttpClient.cpp
+++ b/src/app/HttpClient.cpp
@@ -73,7 +73,7 @@ boolean HttpClient::connectByHostOrIp()
   return _connectionStatus == SUCCESSFUL;
 }
 
-boolean HttpClient::sendHttpQuery(const char *resource, HttpRequestMethod method, Dictionary<DictionaryHelper::StringEntity> *getData, Dictionary<DictionaryHelper::StringEntity> *postData, Dictionary<DictionaryHelper::StringEntity> *headerData)
+int HttpClient::sendHttpQuery(const char *resource, HttpRequestMethod method, Dictionary<DictionaryHelper::StringEntity> *getData, Dictionary<DictionaryHelper::StringEntity> *postData, Dictionary<DictionaryHelper::StringEntity> *headerData)
 {
   if(resource != NULL) //We overwrite the resource if it has been already defined
   {
@@ -88,7 +88,7 @@ boolean HttpClient::sendHttpQuery(const char *resource, HttpRequestMethod method
  return sendHttpQuery(method, getData, postData, headerData);
 }
 
-boolean HttpClient::sendHttpQuery(HttpRequestMethod method, Dictionary<DictionaryHelper::StringEntity> *getData, Dictionary<DictionaryHelper::StringEntity> *postData, Dictionary<DictionaryHelper::StringEntity> *headerData)
+int HttpClient::sendHttpQuery(HttpRequestMethod method, Dictionary<DictionaryHelper::StringEntity> *getData, Dictionary<DictionaryHelper::StringEntity> *postData, Dictionary<DictionaryHelper::StringEntity> *headerData)
 {
   //We reset this two flags
   _httpCode = HTTP_CODE::UNDEFINED_CODE;
@@ -101,7 +101,7 @@ boolean HttpClient::sendHttpQuery(HttpRequestMethod method, Dictionary<Dictionar
 
   if(!connected() || _connectionStatus == FAILED)
   {
-    if(_retries == _maxRetries) return false;
+    if(_retries == _maxRetries) return -__LINE__;
     
     if(_connectionStatus == FAILED)
     {
@@ -116,16 +116,16 @@ boolean HttpClient::sendHttpQuery(HttpRequestMethod method, Dictionary<Dictionar
       Serial.printf("We start a new connection : %s port %u\nretries : %u\n", _pAddress, _port, _retries);
     #endif
     
-    connectByHostOrIp();
-    
-    if(_connectionStatus == FAILED)
+    if(!connectByHostOrIp())
     {
        #ifdef DEBUG_HTTP_CLIENT
        Serial.printf("Failed to reconnect\n");
        #endif
        stop();
-       return false;
+       return -__LINE__;
     }
+    else
+      _retries = 0;
   }
 
   if(connected())
@@ -156,12 +156,12 @@ boolean HttpClient::sendHttpQuery(HttpRequestMethod method, Dictionary<Dictionar
         Serial.printf("Http verb unspecified\n", status());
         #endif
         if(!_keepAlive)stop();
-        return false;
+        return -__LINE__;
         break;
     }
   }
 
-  return true;
+  return 0;
 }
 
 HttpClient::HTTP_CODE HttpClient::isReplyAvailable(uint16_t timeout)
diff --git a/src/app/HttpClient.h b/src/app/HttpClient.h
index 949bd64..8edb14e 100644
--- a/src/app/HttpClient.h
+++ b/src/app/HttpClient.h
@@ -25,13 +25,13 @@ class HttpClient : public WiFiClient, public HttpConstants
     HttpClient(const HttpClient &object);
     virtual ~HttpClient();
 
-    boolean sendHttpQuery(const char *ressource,
+    int sendHttpQuery(const char *ressource,
     HttpRequestMethod method = HttpRequestMethod::GET,
     Dictionary<DictionaryHelper::StringEntity> *getData = NULL,
     Dictionary<DictionaryHelper::StringEntity> *postData = NULL, 
     Dictionary<DictionaryHelper::StringEntity> *headerData = NULL);
     
-    boolean sendHttpQuery(HttpRequestMethod method = HttpRequestMethod::GET,
+    int sendHttpQuery(HttpRequestMethod method = HttpRequestMethod::GET,
     Dictionary<DictionaryHelper::StringEntity> *getData = NULL,
     Dictionary<DictionaryHelper::StringEntity> *postData = NULL,
     Dictionary<DictionaryHelper::StringEntity> *headerData = NULL);