@@ -252,12 +252,18 @@ void InfluxDBClient::setUrls() {
252252 _queryUrl += " /api/v2/query?org=" ;
253253 _queryUrl += urlEncode (_org.c_str ());
254254 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 ());
255258 } else {
256259 _writeUrl = _serverUrl;
257260 _writeUrl += " /write?db=" ;
258261 _writeUrl += urlEncode (_bucket.c_str ());
259262 _queryUrl = _serverUrl;
260263 _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" ;
261267 if (_user.length () > 0 && _password.length () > 0 ) {
262268 String auth = " &u=" ;
263269 auth += urlEncode (_user.c_str ());
@@ -266,9 +272,11 @@ void InfluxDBClient::setUrls() {
266272 _writeUrl += auth;
267273 _queryUrl += " ?" ;
268274 _queryUrl += auth;
275+ _validateUrl += auth;
269276 }
270277 INFLUXDB_CLIENT_DEBUG (" [D] writeUrl: %s\n " , _writeUrl.c_str ());
271278 INFLUXDB_CLIENT_DEBUG (" [D] queryUrl: %s\n " , _queryUrl.c_str ());
279+ INFLUXDB_CLIENT_DEBUG (" [D] validateUrl: %s\n " , _validateUrl.c_str ());
272280 }
273281 if (_writeOptions._writePrecision != WritePrecision::NoTime) {
274282 _writeUrl += " &precision=" ;
@@ -543,11 +551,9 @@ bool InfluxDBClient::validateConnection() {
543551 _lastErrorResponse = FPSTR (UninitializedMessage);
544552 return false ;
545553 }
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 ());
549555
550- if (!_httpClient->begin (*_wifiClient, url )) {
556+ if (!_httpClient->begin (*_wifiClient, _validateUrl )) {
551557 INFLUXDB_CLIENT_DEBUG (" [E] begin failed\n " );
552558 return false ;
553559 }
0 commit comments