Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions examples/WebSocket/WebSocket.ino
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ void setup() {
if (info->message_opcode == WS_TEXT) {
Serial.printf("ws text: %s\n", (char *)data);
client->ping();
// Also send a message in the message queue when we get one
ws.textAll("Message received: " + String((char *)data));
}

} else {
Expand Down
4 changes: 2 additions & 2 deletions src/AsyncEventSource.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ AsyncEventSourceClient::~AsyncEventSourceClient() {

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

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

bool AsyncEventSourceClient::_queueMessage(AsyncEvent_SharedData_t &&msg) {
if (_messageQueue.size() >= SSE_MAX_QUEUED_MESSAGES) {
async_ws_log_e("Event message queue overflow: discard message");
async_ws_log_w("Event message queue overflow: discard message");
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions src/AsyncJson.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ void AsyncCallbackJsonWebHandler::handleRequest(AsyncWebServerRequest *request)
// POST / PUT / ... requests:
// check if JSON body is too large, if it is, don't deserialize
if (request->contentLength() > _maxContentLength) {
async_ws_log_e("Content length exceeds maximum allowed");
async_ws_log_w("Content length exceeds maximum allowed");
request->send(413);
return;
}
Expand Down Expand Up @@ -206,7 +206,7 @@ void AsyncCallbackJsonWebHandler::handleBody(AsyncWebServerRequest *request, uin
// no way to know the actual length in advance. The best
// way to handle this would be to use a String instead of
// a fixed-length buffer, but for now we just reject.
async_ws_log_e("AsyncJson cannot handle chunked requests without X-Expected-Entity-Length");
async_ws_log_w("AsyncJson cannot handle chunked requests without X-Expected-Entity-Length");
request->abort();
return;
}
Expand Down
4 changes: 2 additions & 2 deletions src/AsyncWebSocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -485,10 +485,10 @@ bool AsyncWebSocketClient::_queueMessage(AsyncWebSocketSharedBuffer buffer, uint
_client->close();
}

async_ws_log_e("Too many messages queued: closing connection");
async_ws_log_w("Too many messages queued: closing connection");

} else {
async_ws_log_e("Too many messages queued: discarding new message");
async_ws_log_w("Too many messages queued: discarding new message");
}

return false;
Expand Down
2 changes: 1 addition & 1 deletion src/WebHandlers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ void AsyncStaticWebHandler::handleRequest(AsyncWebServerRequest *request) {
//File is a gz, get etag from CRC in trailer
if (!AsyncWebServerRequest::_getEtag(request->_tempFile, etag)) {
// File is corrupted or invalid
async_ws_log_e("File is corrupted or invalid: %s", tempFileName);
async_ws_log_w("File is corrupted or invalid: %s", tempFileName);
request->send(404);
return;
}
Expand Down