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

add bufsize to messagetime()

Browse Source
This commit is contained in:
proddy
2022-03-07 12:30:50 +01:00
parent 69dc26005a
commit 828e769b3b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/web/WebLogService.cpp
View File

@@ -156,9 +156,9 @@ void WebLogService::loop() {
} }
// convert time to real offset // convert time to real offset
char * WebLogService::messagetime(char * out, const uint64_t t) { char * WebLogService::messagetime(char * out, const uint64_t t, size_t bufsize) {
if (!time_offset_) { if (!time_offset_) {
strlcpy(out, uuid::log::format_timestamp_ms(t, 3).c_str(), sizeof(out)); strlcpy(out, uuid::log::format_timestamp_ms(t, 3).c_str(), bufsize);
} else { } else {
time_t t1 = time_offset_ + t / 1000ULL; time_t t1 = time_offset_ + t / 1000ULL;
strftime(out, 25, "%F %T", localtime(&t1)); strftime(out, 25, "%F %T", localtime(&t1));
@@ -173,7 +173,7 @@ void WebLogService::transmit(const QueuedLogMessage & message) {
JsonObject logEvent = jsonDocument.to<JsonObject>(); JsonObject logEvent = jsonDocument.to<JsonObject>();
char time_string[25]; char time_string[25];
logEvent["t"] = messagetime(time_string, message.content_->uptime_ms); logEvent["t"] = messagetime(time_string, message.content_->uptime_ms, sizeof(time_string));
logEvent["l"] = message.content_->level; logEvent["l"] = message.content_->level;
logEvent["i"] = message.id_; logEvent["i"] = message.id_;
logEvent["n"] = message.content_->name; logEvent["n"] = message.content_->name;
@@ -200,7 +200,7 @@ void WebLogService::fetchLog(AsyncWebServerRequest * request) {
JsonObject logEvent = log.createNestedObject(); JsonObject logEvent = log.createNestedObject();
char time_string[25]; char time_string[25];
logEvent["t"] = messagetime(time_string, message.content_->uptime_ms); logEvent["t"] = messagetime(time_string, message.content_->uptime_ms, sizeof(time_string));
logEvent["l"] = message.content_->level; logEvent["l"] = message.content_->level;
logEvent["i"] = message.id_; logEvent["i"] = message.id_;
logEvent["n"] = message.content_->name; logEvent["n"] = message.content_->name;

2
src/web/WebLogService.h
View File

@@ -62,7 +62,7 @@ class WebLogService : public uuid::log::Handler {
void fetchLog(AsyncWebServerRequest * request); void fetchLog(AsyncWebServerRequest * request);
void getValues(AsyncWebServerRequest * request); void getValues(AsyncWebServerRequest * request);
char * messagetime(char * out, const uint64_t t); char * messagetime(char * out, const uint64_t t, size_t bufsize);
void setValues(AsyncWebServerRequest * request, JsonVariant & json); void setValues(AsyncWebServerRequest * request, JsonVariant & json);
AsyncCallbackJsonWebHandler setValues_; // for POSTs AsyncCallbackJsonWebHandler setValues_; // for POSTs