From 6cd763de4f4b5af2e9094fbbeee11c777c45f260 Mon Sep 17 00:00:00 2001 From: Markus Mertama Date: Sun, 8 Dec 2024 19:07:27 +0200 Subject: [PATCH] suppress LWS errors by default --- aspell/gempyre_words.txt | 1 - gempyrelib/cmake/libwebsockets.cmake | 2 ++ gempyrelib/src/libwebsockets/server.cpp | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/aspell/gempyre_words.txt b/aspell/gempyre_words.txt index 775cb61..77ffe13 100644 --- a/aspell/gempyre_words.txt +++ b/aspell/gempyre_words.txt @@ -344,7 +344,6 @@ perf POC protobuf Rasberry -Supress treeview UIs uwebsockets diff --git a/gempyrelib/cmake/libwebsockets.cmake b/gempyrelib/cmake/libwebsockets.cmake index ebaf4b5..d41fd71 100644 --- a/gempyrelib/cmake/libwebsockets.cmake +++ b/gempyrelib/cmake/libwebsockets.cmake @@ -101,6 +101,8 @@ endif() set(USE_LIBWEBSOCKETS TRUE) +target_compile_definitions(websockets PRIVATE SUPRESS_WS_ERRORS) + macro(socket_dependencies TARGET) target_link_directories(${TARGET} PRIVATE ${libwebsockets_BINARY_DIR}/lib) target_compile_definitions(${TARGET} PRIVATE USE_LIBWEBSOCKETS) diff --git a/gempyrelib/src/libwebsockets/server.cpp b/gempyrelib/src/libwebsockets/server.cpp index d18249e..1c2c4c1 100644 --- a/gempyrelib/src/libwebsockets/server.cpp +++ b/gempyrelib/src/libwebsockets/server.cpp @@ -338,14 +338,17 @@ int LWS_Server::http_callback(lws *wsi, enum lws_callback_reasons reason, void* static void set_lws_log_level() { - int logs = LLL_USER | LLL_ERR | LLL_NOTICE + int logs = LLL_USER | LLL_NOTICE /* for LLL_ verbosity above NOTICE to be built into lws, * lws must have been configured and built with * -DCMAKE_BUILD_TYPE=DEBUG instead of =RELEASE */ /* | LLL_INFO */ /* | LLL_PARSER */ /* | LLL_HEADER */ /* | LLL_EXT */ /* | LLL_CLIENT */ /* | LLL_LATENCY */ #ifdef LWS_DEBUG - | | LLL_WARN | LLL_DEBUG ; + | LLL_WARN | LLL_DEBUG +#endif +#ifndef SUPRESS_WS_ERRORS + | LLL_ERR #endif ; lws_set_log_level(logs, [](int level, const char* line) {