nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add output for executed commands

Browse Source
This commit is contained in:
John
2024-12-31 08:37:06 +01:00
parent 2da8516c50
commit 5d4d75d631
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.md
+1
View File
@@ -8,6 +8,7 @@
## Features ## Features
* add "-m" option to "encode" and "decode" commands * add "-m" option to "encode" and "decode" commands
* add output for commands executed with "--inject=stop"
# 24.1 (2024-10-27) # 24.1 (2024-10-27)
src/ebusd/main.cpp
+11 -6
View File
@@ -554,15 +554,20 @@ int main(int argc, char* argv[], char* envp[]) {
if (arg.find_first_of(' ') != string::npos || arg.find_first_of('/') == string::npos) { if (arg.find_first_of(' ') != string::npos || arg.find_first_of('/') == string::npos) {
RequestImpl req(false); RequestImpl req(false);
req.add(argv[arg_index]); req.add(argv[arg_index]);
bool connected; bool connected = true;
RequestMode reqMode; RequestMode reqMode = {};
string user; string user;
bool reload; bool reload = false;
ostringstream ostream; ostringstream ostream;
result_t ret = s_mainLoop->decodeRequest(&req, &connected, &reqMode, &user, &reload, &ostream); result_t ret = s_mainLoop->decodeRequest(&req, &connected, &reqMode, &user, &reload, &ostream);
if (ret != RESULT_OK) { string output = ostream.str();
string output = ostream.str(); if (ret != RESULT_OK || output.substr(0, 3) == "ERR" || output.substr(0, 5) == "usage") {
logError(lf_main, "executing command %s failed: %d", argv[arg_index], output.c_str()); if (output.empty()) {
output = getResultCode(ret);
}
logError(lf_main, "executing command \"%s\" failed: %s", argv[arg_index], output.c_str());
} else if (s_opt.stopAfterInject) {
logNotice(lf_main, "executed command \"%s\": %s", argv[arg_index], output.c_str());
} }
continue; continue;
} }