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

fix exit not exiting in standalone mode

Browse Source
This commit is contained in:
Proddy
2023-01-30 17:04:10 +01:00
parent 7a2038e124
commit 8f68163f90
3 changed files with 8 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/console.cpp
View File

@@ -70,28 +70,13 @@ static void setup_commands(std::shared_ptr<Commands> & commands) {
// log, exit, help // log, exit, help
for (unsigned int context = ShellContext::MAIN; context < ShellContext::END; context++) { for (unsigned int context = ShellContext::MAIN; context < ShellContext::END; context++) {
commands->add_command(context, CommandFlags::USER, {F_(log)}, {F_(log_level_optional)}, console_log_level, log_level_autocomplete); commands->add_command(context, CommandFlags::USER, {F_(log)}, {F_(log_level_optional)}, console_log_level, log_level_autocomplete);
commands->add_command(context, CommandFlags::USER, {F_(exit)}, EMSESPShell::main_exit_function);
commands->add_command(context,
CommandFlags::USER,
{F_(exit)},
context == ShellContext::MAIN ? EMSESPShell::main_exit_function : EMSESPShell::generic_exit_context_function);
commands->add_command(context, CommandFlags::USER, {F_(help)}, EMSESPShell::main_help_function); commands->add_command(context, CommandFlags::USER, {F_(help)}, EMSESPShell::main_help_function);
// commands->add_command(context, CommandFlags::USER, {F_(logout)}, EMSESPShell::main_logout_function);
} }
/* example of going into a new context
commands->add_command(ShellContext::MAIN, CommandFlags::ADMIN, flash_string_vector{F_(fs)},
[] (Shell &shell, const std::vector<std::string> &arguments) {
shell.enter_context(ShellContext::FILESYSTEM);
});
*/
// //
// Show commands // Show commands
// //
commands->add_command(ShellContext::MAIN, commands->add_command(ShellContext::MAIN,
CommandFlags::USER, CommandFlags::USER,
string_vector{F_(show), F_(system)}, string_vector{F_(show), F_(system)},
@@ -721,39 +706,17 @@ std::string EMSESPShell::prompt_suffix() {
void EMSESPShell::end_of_transmission() { void EMSESPShell::end_of_transmission() {
invoke_command(F_(exit)); invoke_command(F_(exit));
// if (context() != ShellContext::MAIN || has_flags(CommandFlags::ADMIN)) {
// invoke_command(F_(exit));
// } else {
// invoke_command(F_(logout));
// }
} }
void EMSESPShell::generic_exit_context_function(Shell & shell, const std::vector<std::string> & arguments) {
shell.exit_context();
};
void EMSESPShell::main_help_function(Shell & shell, const std::vector<std::string> & arguments) { void EMSESPShell::main_help_function(Shell & shell, const std::vector<std::string> & arguments) {
shell.print_all_available_commands(); shell.print_all_available_commands();
} }
void EMSESPShell::main_exit_function(Shell & shell, const std::vector<std::string> & arguments) { void EMSESPShell::main_exit_function(Shell & shell, const std::vector<std::string> & arguments) {
if (shell.has_flags(CommandFlags::ADMIN)) { shell.stop();
EMSESPShell::main_exit_admin_function(shell, NO_ARGUMENTS);
} else {
EMSESPShell::main_exit_user_function(shell, NO_ARGUMENTS);
}
} }
void EMSESPShell::main_exit_user_function(Shell & shell, const std::vector<std::string> & arguments) { // **** EMSESPConsole *****
shell.stop();
};
void EMSESPShell::main_exit_admin_function(Shell & shell, const std::vector<std::string> & arguments) {
shell.logger().log(LogLevel::INFO, LogFacility::AUTH, "Admin session closed on console %s", to_shell(shell).console_name().c_str());
shell.remove_flags(CommandFlags::ADMIN);
};
// **** EMSESPConsole *****
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
std::vector<bool> EMSESPConsole::ptys_; std::vector<bool> EMSESPConsole::ptys_;

4
src/console.h
View File

@@ -44,7 +44,6 @@ class EMSESPShell : public uuid::console::Shell {
virtual std::string console_name() = 0; virtual std::string console_name() = 0;
static void generic_exit_context_function(Shell & shell, const std::vector<std::string> & arguments);
static void main_help_function(Shell & shell, const std::vector<std::string> & arguments); static void main_help_function(Shell & shell, const std::vector<std::string> & arguments);
static void main_exit_function(Shell & shell, const std::vector<std::string> & arguments); static void main_exit_function(Shell & shell, const std::vector<std::string> & arguments);
@@ -65,9 +64,6 @@ class EMSESPShell : public uuid::console::Shell {
void end_of_transmission() override; void end_of_transmission() override;
private: private:
static void main_exit_user_function(Shell & shell, const std::vector<std::string> & arguments);
static void main_exit_admin_function(Shell & shell, const std::vector<std::string> & arguments);
std::string console_hostname_; std::string console_hostname_;
}; };

5
src/emsesp.cpp
View File

@@ -1528,8 +1528,13 @@ void EMSESP::loop() {
if (system_.telnet_enabled()) { if (system_.telnet_enabled()) {
telnet_.loop(); telnet_.loop();
} }
#else
if (!shell_->running()) {
::exit(0);
}
#endif #endif
Shell::loop_all(); Shell::loop_all();
} }