andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 01:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove /rest/fetchLog

Browse Source
This commit is contained in:
proddy
2024-09-12 17:54:17 +02:00
parent 44644d522c
commit b4712db4ae
5 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/web/WebLogService.cpp
View File

@@ -27,9 +27,6 @@ WebLogService::WebLogService(AsyncWebServer * server, SecurityManager * security
// get & set settings
server->on(EMSESP_LOG_SETTINGS_PATH, [this](AsyncWebServerRequest * request, JsonVariant json) { getSetValues(request, json); });
// for bring back the whole log - is a command, hence a POST
server->on(EMSESP_FETCH_LOG_PATH, HTTP_POST, [this](AsyncWebServerRequest * request) { fetchLog(request); });
// events_.setFilter(securityManager->filterRequest(AuthenticationPredicates::IS_ADMIN));
server->addHandler(&events_);
}
@@ -236,13 +233,6 @@ void WebLogService::transmit(const QueuedLogMessage & message) {
delete[] buffer;
}
// send the complete log buffer to the API, not filtering on log level
// done by resetting the pointer
void WebLogService::fetchLog(AsyncWebServerRequest * request) {
log_message_id_tail_ = 0;
request->send(200);
}
// sets the values after a POST
void WebLogService::getSetValues(AsyncWebServerRequest * request, JsonVariant json) {
if ((request->method() == HTTP_GET) || (!json.is<JsonObject>())) {
@@ -256,9 +246,14 @@ void WebLogService::getSetValues(AsyncWebServerRequest * request, JsonVariant js
response->setLength();
request->send(response);
// reset the tail pointer so complete log is sent
log_message_id_tail_ = 0;
return;
}
// POST - set the values
auto && body = json.as<JsonObject>();
uuid::log::Level level = body["level"];

2
src/web/WebLogService.h
View File

@@ -20,7 +20,6 @@
#define WebLogService_h
#define EMSESP_EVENT_SOURCE_LOG_PATH "/es/log"
#define EMSESP_FETCH_LOG_PATH "/rest/fetchLog"
#define EMSESP_LOG_SETTINGS_PATH "/rest/logSettings"
using ::uuid::console::Shell;
@@ -62,7 +61,6 @@ class WebLogService : public uuid::log::Handler {
};
void transmit(const QueuedLogMessage & message);
void fetchLog(AsyncWebServerRequest * request);
void getSetValues(AsyncWebServerRequest * request, JsonVariant json);
char * messagetime(char * out, const uint64_t t, const size_t bufsize);