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

show console log with ISO date/time, #2533

Browse Source
This commit is contained in:
MichaelDvP
2025-04-25 08:05:15 +02:00
parent ea46c79278
commit e3566feefb
5 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG_LATEST.md
View File

@@ -24,4 +24,4 @@ For more details go to [docs.emsesp.org](https://docs.emsesp.org/).
## Changed ## Changed
- - show console log with ISO date/time [#2533](https://github.com/emsesp/EMS-ESP32/discussions/2533)

4
interface/package.json
View File

@@ -36,7 +36,7 @@
"react": "^19.1.0", "react": "^19.1.0",
"react-dom": "^19.1.0", "react-dom": "^19.1.0",
"react-icons": "^5.5.0", "react-icons": "^5.5.0",
"react-router": "^7.5.1", "react-router": "^7.5.2",
"react-toastify": "^11.0.5", "react-toastify": "^11.0.5",
"typesafe-i18n": "^5.26.2", "typesafe-i18n": "^5.26.2",
"typescript": "^5.8.3" "typescript": "^5.8.3"
@@ -47,7 +47,7 @@
"@preact/compat": "^18.3.1", "@preact/compat": "^18.3.1",
"@preact/preset-vite": "^2.10.1", "@preact/preset-vite": "^2.10.1",
"@trivago/prettier-plugin-sort-imports": "^5.2.2", "@trivago/prettier-plugin-sort-imports": "^5.2.2",
"@types/node": "^22.14.1", "@types/node": "^22.15.1",
"@types/react": "^19.1.2", "@types/react": "^19.1.2",
"@types/react-dom": "^19.1.2", "@types/react-dom": "^19.1.2",
"concurrently": "^9.1.2", "concurrently": "^9.1.2",

23
interface/yarn.lock
View File

@@ -1399,7 +1399,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:*, @types/node@npm:^22.14.1": "@types/node@npm:*":
version: 22.14.1 version: 22.14.1
resolution: "@types/node@npm:22.14.1" resolution: "@types/node@npm:22.14.1"
dependencies: dependencies:
@@ -1408,6 +1408,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:^22.15.1":
version: 22.15.1
resolution: "@types/node@npm:22.15.1"
dependencies:
undici-types: "npm:~6.21.0"
checksum: 10c0/80bd7fff7d6f4058875feb2c980fa066266b02ffde51e794cf4b7bea5f1316c08baa135fa7cbffa677efb999b0945b2697b318e84af4563c1ab8d3392a17bf9a
languageName: node
linkType: hard
"@types/parse-json@npm:^4.0.0": "@types/parse-json@npm:^4.0.0":
version: 4.0.2 version: 4.0.2
resolution: "@types/parse-json@npm:4.0.2" resolution: "@types/parse-json@npm:4.0.2"
@@ -1594,7 +1603,7 @@ __metadata:
"@preact/preset-vite": "npm:^2.10.1" "@preact/preset-vite": "npm:^2.10.1"
"@table-library/react-table-library": "npm:4.1.15" "@table-library/react-table-library": "npm:4.1.15"
"@trivago/prettier-plugin-sort-imports": "npm:^5.2.2" "@trivago/prettier-plugin-sort-imports": "npm:^5.2.2"
"@types/node": "npm:^22.14.1" "@types/node": "npm:^22.15.1"
"@types/react": "npm:^19.1.2" "@types/react": "npm:^19.1.2"
"@types/react-dom": "npm:^19.1.2" "@types/react-dom": "npm:^19.1.2"
alova: "npm:3.2.10" alova: "npm:3.2.10"
@@ -1610,7 +1619,7 @@ __metadata:
react: "npm:^19.1.0" react: "npm:^19.1.0"
react-dom: "npm:^19.1.0" react-dom: "npm:^19.1.0"
react-icons: "npm:^5.5.0" react-icons: "npm:^5.5.0"
react-router: "npm:^7.5.1" react-router: "npm:^7.5.2"
react-toastify: "npm:^11.0.5" react-toastify: "npm:^11.0.5"
rollup-plugin-visualizer: "npm:^5.14.0" rollup-plugin-visualizer: "npm:^5.14.0"
terser: "npm:^5.39.0" terser: "npm:^5.39.0"
@@ -5572,9 +5581,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"react-router@npm:^7.5.1": "react-router@npm:^7.5.2":
version: 7.5.1 version: 7.5.2
resolution: "react-router@npm:7.5.1" resolution: "react-router@npm:7.5.2"
dependencies: dependencies:
cookie: "npm:^1.0.1" cookie: "npm:^1.0.1"
set-cookie-parser: "npm:^2.6.0" set-cookie-parser: "npm:^2.6.0"
@@ -5585,7 +5594,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
react-dom: react-dom:
optional: true optional: true
checksum: 10c0/54e9f77ede0bf36c12685a59c5d965f77f2223d01cd922ce7b6ef4f8fa5435e66c796f9f5da3487bde0cb98dadd64f5a406696d4f52e031af812857aaab0f76b checksum: 10c0/5972ecb783e0ac0512c500b84bd4ff475665ba49c67b69e13b79dc24c7ee0496d523858058bb43c70147367688e0cc0d6d6d0f51cabfdebfbc5556d559bff457
languageName: node languageName: node
linkType: hard linkType: hard

8
lib/uuid-console/src/shell_log.cpp
View File

@@ -106,7 +106,15 @@ void Shell::output_logs() {
} }
while (1) { while (1) {
time_t offset = time(nullptr) - uuid::get_uptime_sec();
if (offset < 1500000000L) {
print(uuid::log::format_timestamp_ms(message.content_->uptime_ms, 3)); print(uuid::log::format_timestamp_ms(message.content_->uptime_ms, 3));
} else {
time_t t1 = offset + (time_t)(message.content_->uptime_ms / 1000);
char timestr[25];
strftime(timestr, 25, "%FT%T", localtime(&t1));
printf("%s.%03d", timestr, (uint16_t)(message.content_->uptime_ms % 1000));
}
printf(" %c %lu: [%s] ", uuid::log::format_level_char(message.content_->level), message.id_, message.content_->name); printf(" %c %lu: [%s] ", uuid::log::format_level_char(message.content_->level), message.id_, message.content_->name);
if ((message.content_->level == uuid::log::Level::ERR) || (message.content_->level == uuid::log::Level::WARNING)) { if ((message.content_->level == uuid::log::Level::ERR) || (message.content_->level == uuid::log::Level::WARNING)) {

2
src/emsesp_version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.7.3-dev.9" #define EMSESP_APP_VERSION "3.7.3-dev.10"