Skip to content

Commit 04991a7

Browse files
Merge pull request #396 from ESP32Async/logging
Reduce warning level to warn for some lines
2 parents a9f5427 + 652276d commit 04991a7

5 files changed

Lines changed: 9 additions & 7 deletions

File tree

examples/WebSocket/WebSocket.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ void setup() {
118118
if (info->message_opcode == WS_TEXT) {
119119
Serial.printf("ws text: %s\n", (char *)data);
120120
client->ping();
121+
// Also send a message in the message queue when we get one
122+
ws.textAll("Message received: " + String((char *)data));
121123
}
122124

123125
} else {

src/AsyncEventSource.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ AsyncEventSourceClient::~AsyncEventSourceClient() {
200200

201201
bool AsyncEventSourceClient::_queueMessage(const char *message, size_t len) {
202202
if (_messageQueue.size() >= SSE_MAX_QUEUED_MESSAGES) {
203-
async_ws_log_e("Event message queue overflow: discard message");
203+
async_ws_log_w("Event message queue overflow: discard message");
204204
return false;
205205
}
206206

@@ -231,7 +231,7 @@ bool AsyncEventSourceClient::_queueMessage(const char *message, size_t len) {
231231

232232
bool AsyncEventSourceClient::_queueMessage(AsyncEvent_SharedData_t &&msg) {
233233
if (_messageQueue.size() >= SSE_MAX_QUEUED_MESSAGES) {
234-
async_ws_log_e("Event message queue overflow: discard message");
234+
async_ws_log_w("Event message queue overflow: discard message");
235235
return false;
236236
}
237237

src/AsyncJson.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ void AsyncCallbackJsonWebHandler::handleRequest(AsyncWebServerRequest *request)
151151
// POST / PUT / ... requests:
152152
// check if JSON body is too large, if it is, don't deserialize
153153
if (request->contentLength() > _maxContentLength) {
154-
async_ws_log_e("Content length exceeds maximum allowed");
154+
async_ws_log_w("Content length exceeds maximum allowed");
155155
request->send(413);
156156
return;
157157
}
@@ -206,7 +206,7 @@ void AsyncCallbackJsonWebHandler::handleBody(AsyncWebServerRequest *request, uin
206206
// no way to know the actual length in advance. The best
207207
// way to handle this would be to use a String instead of
208208
// a fixed-length buffer, but for now we just reject.
209-
async_ws_log_e("AsyncJson cannot handle chunked requests without X-Expected-Entity-Length");
209+
async_ws_log_w("AsyncJson cannot handle chunked requests without X-Expected-Entity-Length");
210210
request->abort();
211211
return;
212212
}

src/AsyncWebSocket.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,10 +485,10 @@ bool AsyncWebSocketClient::_queueMessage(AsyncWebSocketSharedBuffer buffer, uint
485485
_client->close();
486486
}
487487

488-
async_ws_log_e("Too many messages queued: closing connection");
488+
async_ws_log_w("Too many messages queued: closing connection");
489489

490490
} else {
491-
async_ws_log_e("Too many messages queued: discarding new message");
491+
async_ws_log_w("Too many messages queued: discarding new message");
492492
}
493493

494494
return false;

src/WebHandlers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ void AsyncStaticWebHandler::handleRequest(AsyncWebServerRequest *request) {
218218
//File is a gz, get etag from CRC in trailer
219219
if (!AsyncWebServerRequest::_getEtag(request->_tempFile, etag)) {
220220
// File is corrupted or invalid
221-
async_ws_log_e("File is corrupted or invalid: %s", tempFileName);
221+
async_ws_log_w("File is corrupted or invalid: %s", tempFileName);
222222
request->send(404);
223223
return;
224224
}

0 commit comments

Comments
 (0)