Only for tcp timeout

Ignoring connect to server timeout
This commit is contained in:
samuelbles07
2024-09-11 16:37:50 +07:00
parent e16373a64d
commit 013fb94307
2 changed files with 9 additions and 21 deletions

View File

@ -2,6 +2,13 @@
#include "AgConfigure.h"
#include "AirGradient.h"
#include "Libraries/Arduino_JSON/src/Arduino_JSON.h"
#ifdef ESP8266
#include <ESP8266HTTPClient.h>
#include <ESP8266WiFi.h>
#include <WiFiClient.h>
#else
#include <HTTPClient.h>
#endif
AgApiClient::AgApiClient(Stream &debug, Configuration &config)
: PrintLog(debug, "ApiClient"), config(config) {}
@ -51,7 +58,7 @@ bool AgApiClient::fetchServerConfiguration(void) {
}
#else
HTTPClient client;
_setHttpClientTimeout(&client);
client.setTimeout(timeoutMs);
if (client.begin(uri) == false) {
getConfigFailed = true;
return false;
@ -113,7 +120,7 @@ bool AgApiClient::postToServer(String data) {
WiFiClient wifiClient;
HTTPClient client;
_setHttpClientTimeout(&client);
client.setTimeout(timeoutMs);
if (client.begin(wifiClient, uri.c_str()) == false) {
logError("Init client failed");
return false;
@ -192,12 +199,3 @@ void AgApiClient::setApiRoot(const String &apiRoot) { this->apiRoot = apiRoot; }
void AgApiClient::setTimeout(uint16_t timeoutMs) {
this->timeoutMs = timeoutMs;
}
/**
* @brief Set timeout to both connect to server and tcp connection timeout
*
*/
void AgApiClient::_setHttpClientTimeout(HTTPClient *httpClient) {
httpClient->setTimeout(timeoutMs);
httpClient->setConnectTimeout(timeoutMs);
}

View File

@ -16,14 +16,6 @@
#include "Main/PrintLog.h"
#include <Arduino.h>
#ifdef ESP8266
#include <ESP8266HTTPClient.h>
#include <ESP8266WiFi.h>
#include <WiFiClient.h>
#else
#include <HTTPClient.h>
#endif
class AgApiClient : public PrintLog {
private:
Configuration &config;
@ -35,8 +27,6 @@ private:
bool notAvailableOnDashboard = false; // Device not setup on Airgradient cloud dashboard.
uint16_t timeoutMs = 10000; // Default set to 10s
void _setHttpClientTimeout(HTTPClient *httpClient);
public:
AgApiClient(Stream &stream, Configuration &config);
~AgApiClient();