aboutsummaryrefslogtreecommitdiffstats
path: root/src/core/function/gpg
diff options
context:
space:
mode:
authorsaturneric <[email protected]>2024-07-30 18:48:25 +0000
committersaturneric <[email protected]>2024-07-30 18:48:25 +0000
commit99c1b2c3ed902969d8940e384ff9fcd2805098b0 (patch)
treea86ab01bbe3f85318f869ffdebfcba623be6a857 /src/core/function/gpg
parentfeat: simplify logging (diff)
downloadGpgFrontend-99c1b2c3ed902969d8940e384ff9fcd2805098b0.tar.gz
GpgFrontend-99c1b2c3ed902969d8940e384ff9fcd2805098b0.zip
fix: do clean up
Diffstat (limited to 'src/core/function/gpg')
-rw-r--r--src/core/function/gpg/GpgAdvancedOperator.cpp3
-rw-r--r--src/core/function/gpg/GpgCommandExecutor.cpp5
-rw-r--r--src/core/function/gpg/GpgContext.cpp4
-rw-r--r--src/core/function/gpg/GpgKeyOpera.cpp5
4 files changed, 6 insertions, 11 deletions
diff --git a/src/core/function/gpg/GpgAdvancedOperator.cpp b/src/core/function/gpg/GpgAdvancedOperator.cpp
index 20d9aa4b..f143cdbb 100644
--- a/src/core/function/gpg/GpgAdvancedOperator.cpp
+++ b/src/core/function/gpg/GpgAdvancedOperator.cpp
@@ -120,8 +120,7 @@ void GpgFrontend::GpgAdvancedOperator::RestartGpgComponents() {
FLOG_D("gpgconf --kill --all execute result: %d", success);
if (!success) {
- qCWarning(core,
- "restart all component after core initilized failed");
+ FLOG_W("restart all component after core initilized failed");
Module::UpsertRTValue(
"core", "gpg_advanced_operator.restart_gpg_components", false);
return;
diff --git a/src/core/function/gpg/GpgCommandExecutor.cpp b/src/core/function/gpg/GpgCommandExecutor.cpp
index 374d59d8..74df1d5a 100644
--- a/src/core/function/gpg/GpgCommandExecutor.cpp
+++ b/src/core/function/gpg/GpgCommandExecutor.cpp
@@ -45,9 +45,8 @@ auto BuildTaskFromExecCtx(const GpgCommandExecutor::ExecuteContext &context)
Thread::Task::TaskCallback result_callback =
[cmd](int /*rtn*/, const DataObjectPtr &data_object) {
- qCDebug(core,
- "data object args count of cmd executor result callback: %ld",
- data_object->GetObjectSize());
+ FLOG_D("data object args count of cmd executor result callback: %ld",
+ data_object->GetObjectSize());
if (!data_object->Check<int, QString, GpgCommandExecutorCallback>()) {
FLOG_W("data object checking failed");
diff --git a/src/core/function/gpg/GpgContext.cpp b/src/core/function/gpg/GpgContext.cpp
index 94a4f522..a4757d7f 100644
--- a/src/core/function/gpg/GpgContext.cpp
+++ b/src/core/function/gpg/GpgContext.cpp
@@ -192,9 +192,7 @@ class GpgContext::Impl {
LOG_D() << "got gpgme version version from rt: " << gpgme_version;
if (gpgme_get_keylist_mode(ctx) == 0) {
- qCWarning(
- core,
- "ctx is not a valid pointer, reported by gpgme_get_keylist_mode");
+ FLOG_W("ctx is not a valid pointer, reported by gpgme_get_keylist_mode");
return false;
}
diff --git a/src/core/function/gpg/GpgKeyOpera.cpp b/src/core/function/gpg/GpgKeyOpera.cpp
index 54c90182..d501acbc 100644
--- a/src/core/function/gpg/GpgKeyOpera.cpp
+++ b/src/core/function/gpg/GpgKeyOpera.cpp
@@ -116,9 +116,8 @@ void GpgKeyOpera::GenerateRevokeCert(const GpgKey& key,
LOG_W() << "gnupg gen revoke execute error, process stderr: "
<< p_err << ", process stdout: " << p_out;
} else {
- qCDebug(core,
- "gnupg gen revoke exit_code: %d, process stdout size: %lld",
- exit_code, p_out.size());
+ FLOG_D("gnupg gen revoke exit_code: %d, process stdout size: %lld",
+ exit_code, p_out.size());
}
},
nullptr,