Skip to content

Commit b082482

Browse files
mrengineer7777mrengineer7777
committed
Update HTTPClient.cpp
1 parent c1dc4f2 commit b082482

File tree

1 file changed

+37
-36
lines changed

1 file changed

+37
-36
lines changed

Diff for: ‎libraries/HTTPClient/src/HTTPClient.cpp

+37-36
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ bool HTTPClient::begin(WiFiClient &client, String url) {
149149
// check for : (http: or https:)
150150
int index = url.indexOf(':');
151151
if(index < 0) {
152-
log_d("failed to parse protocol");
152+
log_e("failed to parse protocol");
153153
return false;
154154
}
155155

156156
String protocol = url.substring(0, index);
157157
if(protocol != "http" && protocol != "https") {
158-
log_d("unknown protocol '%s'", protocol.c_str());
158+
log_e("unknown protocol '%s'", protocol.c_str());
159159
return false;
160160
}
161161

@@ -260,7 +260,7 @@ bool HTTPClient::beginInternal(String url, const char* expectedProtocol)
260260

261261
_protocol = url.substring(0, index);
262262
if (_protocol != expectedProtocol) {
263-
log_d("unexpected protocol: %s, expected %s", _protocol.c_str(), expectedProtocol);
263+
log_w("unexpected protocol: %s, expected %s", _protocol.c_str(), expectedProtocol);
264264
return false;
265265
}
266266

@@ -300,7 +300,7 @@ bool HTTPClient::beginInternal(String url, const char* expectedProtocol)
300300
}
301301
_host = the_host;
302302
_uri = url;
303-
log_d("protocol: %s, host: %s port: %d url: %s", _protocol.c_str(), _host.c_str(), _port, _uri.c_str());
303+
log_v("protocol: %s, host: %s port: %d url: %s", _protocol.c_str(), _host.c_str(), _port, _uri.c_str());
304304
return true;
305305
}
306306

@@ -318,7 +318,7 @@ bool HTTPClient::begin(String host, uint16_t port, String uri)
318318
_port = port;
319319
_uri = uri;
320320
_transportTraits = TransportTraitsPtr(new TransportTraits());
321-
log_d("host: %s port: %d uri: %s", host.c_str(), port, uri.c_str());
321+
log_v("host: %s port: %d uri: %s", host.c_str(), port, uri.c_str());
322322
return true;
323323
}
324324

@@ -340,6 +340,7 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcer
340340
}
341341
_secure = true;
342342
_transportTraits = TransportTraitsPtr(new TLSTraits(CAcert));
343+
log_v("host: %s port: %d uri: %s", host.c_str(), port, uri.c_str());
343344
return true;
344345
}
345346

@@ -390,9 +391,9 @@ void HTTPClient::disconnect(bool preserveClient)
390391
}
391392

392393
if(_reuse && _canReuse) {
393-
log_d("tcp keep open for reuse");
394+
log_v("tcp keep open for reuse");
394395
} else {
395-
log_d("tcp stop");
396+
log_v("tcp stop");
396397
_client->stop();
397398
if(!preserveClient) {
398399
_client = nullptr;
@@ -405,7 +406,7 @@ void HTTPClient::disconnect(bool preserveClient)
405406
}
406407
}
407408
} else {
408-
log_d("tcp is closed\n");
409+
log_v("tcp is closed\n");
409410
}
410411
}
411412

@@ -595,7 +596,7 @@ int HTTPClient::sendRequest(const char * type, uint8_t * payload, size_t size)
595596
}
596597
}
597598

598-
log_d("request type: '%s' redirCount: %d\n", type, redirectCount);
599+
log_v("request type: '%s' redirCount: %d\n", type, redirectCount);
599600

600601
// connect to server
601602
if(!connect()) {
@@ -625,7 +626,7 @@ int HTTPClient::sendRequest(const char * type, uint8_t * payload, size_t size)
625626
}
626627

627628
code = handleHeaderResponse();
628-
log_d("sendRequest code=%d\n", code);
629+
log_v("sendRequest code=%d\n", code);
629630

630631
// Handle redirections as stated in RFC document:
631632
// https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
@@ -654,7 +655,7 @@ int HTTPClient::sendRequest(const char * type, uint8_t * payload, size_t size)
654655
redirectCount += 1;
655656
log_d("following redirect (the same method): '%s' redirCount: %d\n", _location.c_str(), redirectCount);
656657
if (!setURL(_location)) {
657-
log_d("failed setting URL for redirection\n");
658+
log_w("failed setting URL for redirection\n");
658659
// no redirection
659660
break;
660661
}
@@ -670,7 +671,7 @@ int HTTPClient::sendRequest(const char * type, uint8_t * payload, size_t size)
670671
redirectCount += 1;
671672
log_d("following redirect (dropped to GET/HEAD): '%s' redirCount: %d\n", _location.c_str(), redirectCount);
672673
if (!setURL(_location)) {
673-
log_d("failed setting URL for redirection\n");
674+
log_w("failed setting URL for redirection\n");
674675
// no redirection
675676
break;
676677
}
@@ -794,15 +795,15 @@ int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size)
794795

795796
if(bytesWrite != leftBytes) {
796797
// failed again
797-
log_d("short write, asked for %d but got %d failed.", leftBytes, bytesWrite);
798+
log_w("short write, asked for %d but got %d failed.", leftBytes, bytesWrite);
798799
free(buff);
799800
return returnError(HTTPC_ERROR_SEND_PAYLOAD_FAILED);
800801
}
801802
}
802803

803804
// check for write error
804805
if(_client->getWriteError()) {
805-
log_d("stream write error %d", _client->getWriteError());
806+
log_w("stream write error %d", _client->getWriteError());
806807
free(buff);
807808
return returnError(HTTPC_ERROR_SEND_PAYLOAD_FAILED);
808809
}
@@ -821,15 +822,15 @@ int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size)
821822
free(buff);
822823

823824
if(size && (int) size != bytesWritten) {
824-
log_d("Stream payload bytesWritten %d and size %d mismatch!.", bytesWritten, size);
825-
log_d("ERROR SEND PAYLOAD FAILED!");
825+
log_w("Stream payload bytesWritten %d and size %d mismatch!.", bytesWritten, size);
826+
log_w("ERROR SEND PAYLOAD FAILED!");
826827
return returnError(HTTPC_ERROR_SEND_PAYLOAD_FAILED);
827828
} else {
828-
log_d("Stream payload written: %d", bytesWritten);
829+
log_v("Stream payload written: %d", bytesWritten);
829830
}
830831

831832
} else {
832-
log_d("too less ram! need %d", HTTP_TCP_BUFFER_SIZE);
833+
log_e("out of memory! need %d", HTTP_TCP_BUFFER_SIZE);
833834
return returnError(HTTPC_ERROR_TOO_LESS_RAM);
834835
}
835836

@@ -856,7 +857,7 @@ WiFiClient& HTTPClient::getStream(void)
856857
return *_client;
857858
}
858859

859-
log_w("getStream: not connected");
860+
log_i("getStream: not connected");
860861
static WiFiClient empty;
861862
return empty;
862863
}
@@ -871,7 +872,7 @@ WiFiClient* HTTPClient::getStreamPtr(void)
871872
return _client;
872873
}
873874

874-
log_w("getStreamPtr: not connected");
875+
log_i("getStreamPtr: not connected");
875876
return nullptr;
876877
}
877878

@@ -919,7 +920,7 @@ int HTTPClient::writeToStream(Stream * stream)
919920
// read size of chunk
920921
len = (uint32_t) strtol((const char *) chunkHeader.c_str(), NULL, 16);
921922
size += len;
922-
log_d(" read chunk len: %d", len);
923+
log_v(" read chunk len: %d", len);
923924

924925
// data left?
925926
if(len > 0) {
@@ -975,7 +976,7 @@ String HTTPClient::getString(void)
975976
writeToStream(&sstring);
976977
return sstring;
977978
} else {
978-
log_d("not enough memory to reserve a string! need: %d", (_size + 1));
979+
log_w("not enough memory to reserve a string! need: %d", (_size + 1));
979980
}
980981
}
981982

@@ -1113,9 +1114,9 @@ bool HTTPClient::connect(void)
11131114
{
11141115
if(connected()) {
11151116
if(_reuse) {
1116-
log_d("already connected, reusing connection");
1117+
log_v("already connected, reusing connection");
11171118
} else {
1118-
log_d("already connected, try reuse!");
1119+
log_i("already connected, try reuse!");
11191120
}
11201121
while(_client->available() > 0) {
11211122
_client->read();
@@ -1135,25 +1136,25 @@ bool HTTPClient::connect(void)
11351136
#endif
11361137

11371138
if (!_client) {
1138-
log_d("HTTPClient::begin was not called or returned error");
1139+
log_w("HTTPClient::begin was not called or returned error");
11391140
return false;
11401141
}
11411142
#ifdef HTTPCLIENT_1_1_COMPATIBLE
11421143
if (_tcpDeprecated && !_transportTraits->verify(*_client, _host.c_str())) {
1143-
log_d("transport level verify failed");
1144+
log_w("transport level verify failed");
11441145
_client->stop();
11451146
return false;
11461147
}
11471148
#endif
11481149
if(!_client->connect(_host.c_str(), _port, _connectTimeout)) {
1149-
log_d("failed connect to %s:%u", _host.c_str(), _port);
1150+
log_i("failed connect to %s:%u", _host.c_str(), _port);
11501151
return false;
11511152
}
11521153

11531154
// set Timeout for WiFiClient and for Stream::readBytesUntil() and Stream::readStringUntil()
11541155
_client->setTimeout((_tcpTimeout + 500) / 1000);
11551156

1156-
log_d(" connected to %s:%u", _host.c_str(), _port);
1157+
log_v(" connected to %s:%u", _host.c_str(), _port);
11571158

11581159

11591160
/*
@@ -1304,14 +1305,14 @@ int HTTPClient::handleHeaderResponse()
13041305
}
13051306

13061307
if(headerLine == "") {
1307-
log_d("code: %d", _returnCode);
1308+
log_v("code: %d", _returnCode);
13081309

13091310
if(_size > 0) {
1310-
log_d("size: %d", _size);
1311+
log_v("size: %d", _size);
13111312
}
13121313

13131314
if(transferEncoding.length() > 0) {
1314-
log_d("Transfer-Encoding: %s", transferEncoding.c_str());
1315+
log_v("Transfer-Encoding: %s", transferEncoding.c_str());
13151316
if(transferEncoding.equalsIgnoreCase("chunked")) {
13161317
_transferEncoding = HTTPC_TE_CHUNKED;
13171318
} else if(transferEncoding.equalsIgnoreCase("identity")) {
@@ -1326,7 +1327,7 @@ int HTTPClient::handleHeaderResponse()
13261327
if(_returnCode) {
13271328
return _returnCode;
13281329
} else {
1329-
log_d("Remote host is not an HTTP Server!");
1330+
log_w("Remote host is not an HTTP Server!");
13301331
return HTTPC_ERROR_NO_HTTP_SERVER;
13311332
}
13321333
}
@@ -1443,15 +1444,15 @@ int HTTPClient::writeToStreamDataBlock(Stream * stream, int size)
14431444

14441445
free(buff);
14451446

1446-
log_d("connection closed or file end (written: %d).", bytesWritten);
1447+
log_v("connection closed or file end (written: %d).", bytesWritten);
14471448

14481449
if((size > 0) && (size != bytesWritten)) {
1449-
log_d("bytesWritten %d and size %d mismatch!.", bytesWritten, size);
1450+
log_w("bytesWritten %d and size %d mismatch!.", bytesWritten, size);
14501451
return HTTPC_ERROR_STREAM_WRITE;
14511452
}
14521453

14531454
} else {
1454-
log_w("too less ram! need %d", HTTP_TCP_BUFFER_SIZE);
1455+
log_w("out of memory! need %d", HTTP_TCP_BUFFER_SIZE);
14551456
return HTTPC_ERROR_TOO_LESS_RAM;
14561457
}
14571458

@@ -1499,7 +1500,7 @@ bool HTTPClient::setURL(const String& url)
14991500
}
15001501

15011502
if (!url.startsWith(_protocol + ':')) {
1502-
log_d("new URL not the same protocol, expected '%s', URL: '%s'\n", _protocol.c_str(), url.c_str());
1503+
log_w("new URL not the same protocol, expected '%s', URL: '%s'\n", _protocol.c_str(), url.c_str());
15031504
return false;
15041505
}
15051506

0 commit comments

Comments
 (0)