arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-25 20:02:37 +03:00
Code

improve debug out and error handling

Browse Source
This commit is contained in:
Markus Sattler 2015-11-22 15:46:23 +01:00
parent e6c661e7ba
commit be91d96774
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libraries/ESP8266httpClient/src/ESP8266httpClient.cpp
View File

@ -80,11 +80,15 @@ void httpClient::begin(String host, uint16_t port, String url, bool https, Strin
* called after the payload is handeld * called after the payload is handeld
*/ */
void httpClient::end(void) { void httpClient::end(void) {
if((!_reuse || !_canReuse) && connected()) { if(connected()) {
DEBUG_HTTPCLIENT("[HTTP-Client][end] tcp stop \n"); if(_reuse && _canReuse) {
_tcp->stop(); DEBUG_HTTPCLIENT("[HTTP-Client][end] tcp keep open for reuse\n");
} else {
DEBUG_HTTPCLIENT("[HTTP-Client][end] tcp stop\n");
_tcp->stop();
}
} else { } else {
DEBUG_HTTPCLIENT("[HTTP-Client][end] tcp keep open for reuse\n"); DEBUG_HTTPCLIENT("[HTTP-Client][end] tcp is closed\n");
} }
} }
@ -189,12 +193,16 @@ WiFiClient & httpClient::getStream(void) {
/** /**
* write all message body / payload to Stream * write all message body / payload to Stream
* @param stream Stream * * @param stream Stream *
* @return bytes written * @return bytes written ( negative values are error codes )
*/ */
int httpClient::writeToStream(Stream * stream) { int httpClient::writeToStream(Stream * stream) {
if(!stream) { if(!stream) {
return -1; return HTTPC_ERROR_NO_STREAM;
}
if(!connected()) {
return HTTPC_ERROR_NOT_CONNECTED;
} }
// get lenght of document (is -1 when Server sends no Content-Length header) // get lenght of document (is -1 when Server sends no Content-Length header)
@ -219,14 +227,17 @@ int httpClient::writeToStream(Stream * stream) {
if(len > 0) { if(len > 0) {
len -= c; len -= c;
} }
delay(0);
} else {
delay(1);
} }
delay(1);
} }
DEBUG_HTTPCLIENT("[HTTP-Client] connection closed or file end.\n"); DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] connection closed or file end (written: %d).\n", bytesWritten);
if(_size && _size != bytesWritten) { if(_size && _size != bytesWritten) {
DEBUG_HTTPCLIENT("[HTTP-Client] bytesWritten %d and size %d missmatch!.\n", bytesWritten, _size); DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] bytesWritten %d and size %d missmatch!.\n", bytesWritten, _size);
} }
end(); end();

1
libraries/ESP8266httpClient/src/ESP8266httpClient.h
View File

@ -39,6 +39,7 @@
#define HTTPC_ERROR_SEND_PAYLOAD_FAILD (-3) #define HTTPC_ERROR_SEND_PAYLOAD_FAILD (-3)
#define HTTPC_ERROR_NOT_CONNECTED (-4) #define HTTPC_ERROR_NOT_CONNECTED (-4)
#define HTTPC_ERROR_CONNECTION_LOST (-5) #define HTTPC_ERROR_CONNECTION_LOST (-5)
#define HTTPC_ERROR_NO_STREAM (-6)
class httpClient { class httpClient {