Skip to content

Commit 3d50344

Browse files
committed
Merge branch 'service-name-string'
2 parents 1f48a3e + 54c4a44 commit 3d50344

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/framework/EventSocket.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ esp_err_t EventSocket::onFrame(PsychicWebSocketRequest *request, httpd_ws_frame
107107
void EventSocket::emitEvent(String event, JsonObject &jsonObject, const char *originId, bool onlyToSameOrigin)
108108
{
109109
// Only process valid events
110-
if (!isEventValid(String(event)))
110+
if (!isEventValid(event))
111111
{
112-
ESP_LOGW(TAG, "Method tried to emit unregistered event: %s", event);
112+
ESP_LOGW("EventSocket", "Method tried to emit unregistered event: %s", event.c_str());
113113
return;
114114
}
115115

@@ -149,7 +149,7 @@ void EventSocket::emitEvent(String event, JsonObject &jsonObject, const char *or
149149
auto *client = _socket.getClient(originSubscriptionId);
150150
if (client)
151151
{
152-
ESP_LOGV(TAG, "Emitting event: %s to %s[%u], Message[%d]: %s", event, client->remoteIP().toString().c_str(), client->socket(), len, output);
152+
ESP_LOGV("EventSocket", "Emitting event: %s to %s[%u], Message[%d]: %s", event.c_str(), client->remoteIP().toString().c_str(), client->socket(), len, output);
153153
#if FT_ENABLED(EVENT_USE_JSON)
154154
client->sendMessage(HTTPD_WS_TYPE_TEXT, output, len);
155155
#else
@@ -170,7 +170,7 @@ void EventSocket::emitEvent(String event, JsonObject &jsonObject, const char *or
170170
subscriptions.remove(subscription);
171171
continue;
172172
}
173-
ESP_LOGV(TAG, "Emitting event: %s to %s[%u], Message[%d]: %s", event, client->remoteIP().toString().c_str(), client->socket(), len, output);
173+
ESP_LOGV("EventSocket", "Emitting event: %s to %s[%u], Message[%d]: %s", event.c_str(), client->remoteIP().toString().c_str(), client->socket(), len, output);
174174
#if FT_ENABLED(EVENT_USE_JSON)
175175
client->sendMessage(HTTPD_WS_TYPE_TEXT, output, len);
176176
#else

0 commit comments

Comments
 (0)