From ab40a21805572d2daba1f352a98a60d18d39e364 Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 10 Sep 2024 10:19:35 +0200 Subject: [PATCH] show log --- src/console.cpp | 10 ++++------ src/locale_common.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/console.cpp b/src/console.cpp index 8b036ad95..29f01298f 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -51,12 +51,6 @@ static inline EMSESP & to_app(Shell & shell) { static void console_log_level(Shell & shell, const std::vector & arguments) { if (!arguments.empty()) { - // special command called show which dumps out the contents of the web log buffer - if (arguments[0] == "show") { - EMSESP::webLogService.show(shell); - return; - } - uuid::log::Level level; if (uuid::log::parse_level_lowercase(arguments[0], level)) { @@ -97,6 +91,10 @@ static void setup_commands(std::shared_ptr & commands) { string_vector{F_(show), F_(devices)}, [](Shell & shell, const std::vector & arguments) { to_app(shell).show_devices(shell); }); + commands->add_command(ShellContext::MAIN, CommandFlags::USER, string_vector{F_(show), F_(log)}, [](Shell & shell, const std::vector & arguments) { + to_app(shell).webLogService.show(shell); + }); + commands->add_command(ShellContext::MAIN, CommandFlags::USER, string_vector{F_(show), F_(ems)}, [](Shell & shell, const std::vector & arguments) { to_app(shell).show_ems(shell); diff --git a/src/locale_common.h b/src/locale_common.h index 962fe7d2e..ea2977bc8 100644 --- a/src/locale_common.h +++ b/src/locale_common.h @@ -154,7 +154,7 @@ MAKE_WORD_CUSTOM(typeid_mandatory, "") MAKE_WORD_CUSTOM(deviceid_mandatory, "") MAKE_WORD_CUSTOM(device_type_optional, "[device]") MAKE_WORD_CUSTOM(invalid_log_level, "Invalid log level") -MAKE_WORD_CUSTOM(log_level_optional, "[level | show]") +MAKE_WORD_CUSTOM(log_level_optional, "[level]") MAKE_WORD_CUSTOM(name_mandatory, "") MAKE_WORD_CUSTOM(name_optional, "[name]") MAKE_WORD_CUSTOM(new_password_prompt1, "Enter new password: ")