diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/GpgCoreInit.cpp | 2 | ||||
| -rw-r--r-- | src/core/function/gpg/GpgCommandExecutor.cpp | 28 |
2 files changed, 18 insertions, 12 deletions
diff --git a/src/core/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp index d757c10c..ee42579d 100644 --- a/src/core/GpgCoreInit.cpp +++ b/src/core/GpgCoreInit.cpp @@ -68,7 +68,7 @@ void InitLoggingSystem() { #ifdef DEBUG core_logger->set_level(spdlog::level::trace); -#elif +#else core_logger->set_level(spdlog::level::info); #endif diff --git a/src/core/function/gpg/GpgCommandExecutor.cpp b/src/core/function/gpg/GpgCommandExecutor.cpp index 720388a0..8f652b96 100644 --- a/src/core/function/gpg/GpgCommandExecutor.cpp +++ b/src/core/function/gpg/GpgCommandExecutor.cpp @@ -79,17 +79,23 @@ void GpgFrontend::GpgCommandExecutor::Execute( QObject::connect( cmd_process, &QProcess::readyReadStandardOutput, [interact_func, cmd_process]() { interact_func(cmd_process); }); - QObject::connect(cmd_process, &QProcess::errorOccurred, [=]() { - SPDLOG_ERROR("error in executing command: {}", cmd); - }); - QObject::connect(cmd_process, - qOverload<int, QProcess::ExitStatus>(&QProcess::finished), - [=](int, QProcess::ExitStatus status) { - if (status == QProcess::NormalExit) - SPDLOG_INFO("succeed in executing command: {}", cmd); - else - SPDLOG_WARN("error in executing command: {}", cmd); - }); + QObject::connect( + cmd_process, &QProcess::errorOccurred, + [=](QProcess::ProcessError error) { + SPDLOG_ERROR("error in executing command: {} error: {} stdout: {}", + cmd, error, + cmd_process->readAllStandardOutput().toStdString()); + }); + QObject::connect( + cmd_process, qOverload<int, QProcess::ExitStatus>(&QProcess::finished), + [=](int, QProcess::ExitStatus status) { + if (status == QProcess::NormalExit) + SPDLOG_INFO("succeed in executing command: {}, exit status: {}", + cmd, status); + else + SPDLOG_ERROR("error in executing command: {}, exit status: {}", cmd, + status); + }); cmd_process->setProgram(QString::fromStdString(cmd)); |