@@ -252,12 +252,18 @@ void InfluxDBClient::setUrls() {
252
252
_queryUrl += " /api/v2/query?org=" ;
253
253
_queryUrl += urlEncode (_org.c_str ());
254
254
INFLUXDB_CLIENT_DEBUG (" [D] queryUrl: %s\n " , _queryUrl.c_str ());
255
+ _validateUrl = _serverUrl;
256
+ _validateUrl += " /health" ;
257
+ INFLUXDB_CLIENT_DEBUG (" [D] validateUrl: %s\n " , _validateUrl.c_str ());
255
258
} else {
256
259
_writeUrl = _serverUrl;
257
260
_writeUrl += " /write?db=" ;
258
261
_writeUrl += urlEncode (_bucket.c_str ());
259
262
_queryUrl = _serverUrl;
260
263
_queryUrl += " /api/v2/query" ;
264
+ // on version 1.x /ping will by default return status code 204, without verbose
265
+ _validateUrl = _serverUrl;
266
+ _validateUrl += " /ping?verbose=true" ;
261
267
if (_user.length () > 0 && _password.length () > 0 ) {
262
268
String auth = " &u=" ;
263
269
auth += urlEncode (_user.c_str ());
@@ -266,9 +272,11 @@ void InfluxDBClient::setUrls() {
266
272
_writeUrl += auth;
267
273
_queryUrl += " ?" ;
268
274
_queryUrl += auth;
275
+ _validateUrl += auth;
269
276
}
270
277
INFLUXDB_CLIENT_DEBUG (" [D] writeUrl: %s\n " , _writeUrl.c_str ());
271
278
INFLUXDB_CLIENT_DEBUG (" [D] queryUrl: %s\n " , _queryUrl.c_str ());
279
+ INFLUXDB_CLIENT_DEBUG (" [D] validateUrl: %s\n " , _validateUrl.c_str ());
272
280
}
273
281
if (_writeOptions._writePrecision != WritePrecision::NoTime) {
274
282
_writeUrl += " &precision=" ;
@@ -543,11 +551,9 @@ bool InfluxDBClient::validateConnection() {
543
551
_lastErrorResponse = FPSTR (UninitializedMessage);
544
552
return false ;
545
553
}
546
- // on version 1.x /ping will by default return status code 204, without verbose
547
- String url = _serverUrl + (_dbVersion==2 ?" /health" :" /ping?verbose=true" );
548
- INFLUXDB_CLIENT_DEBUG (" [D] Validating connection to %s\n " , url.c_str ());
554
+ INFLUXDB_CLIENT_DEBUG (" [D] Validating connection to %s\n " , _serverUrl.c_str ());
549
555
550
- if (!_httpClient->begin (*_wifiClient, url )) {
556
+ if (!_httpClient->begin (*_wifiClient, _validateUrl )) {
551
557
INFLUXDB_CLIENT_DEBUG (" [E] begin failed\n " );
552
558
return false ;
553
559
}
0 commit comments