1
0

feat: reduce logs

This commit is contained in:
Saturneric 2023-02-11 20:26:08 +08:00
parent 8a0cbb77bb
commit 1784fefaa1
3 changed files with 31 additions and 25 deletions

View File

@ -58,7 +58,7 @@ void GpgFrontend::GpgCommandExecutor::Execute(
Thread::Task::TaskRunnable runner = Thread::Task::TaskRunnable runner =
[](GpgFrontend::Thread::Task::DataObjectPtr data_object) -> int { [](GpgFrontend::Thread::Task::DataObjectPtr data_object) -> int {
SPDLOG_INFO("process runner called, data object size: {}", SPDLOG_DEBUG("process runner called, data object size: {}",
data_object->GetObjectSize()); data_object->GetObjectSize());
if (data_object->GetObjectSize() != 4) if (data_object->GetObjectSize() != 4)
@ -66,7 +66,7 @@ void GpgFrontend::GpgCommandExecutor::Execute(
// get arguments // get arguments
auto cmd = data_object->PopObject<std::string>(); auto cmd = data_object->PopObject<std::string>();
SPDLOG_INFO("get cmd: {}", cmd); SPDLOG_DEBUG("get cmd: {}", cmd);
auto arguments = data_object->PopObject<std::vector<std::string>>(); auto arguments = data_object->PopObject<std::vector<std::string>>();
auto interact_func = auto interact_func =
data_object->PopObject<std::function<void(QProcess *)>>(); data_object->PopObject<std::function<void(QProcess *)>>();
@ -79,22 +79,31 @@ void GpgFrontend::GpgCommandExecutor::Execute(
QObject::connect( QObject::connect(
cmd_process, &QProcess::readyReadStandardOutput, cmd_process, &QProcess::readyReadStandardOutput,
[interact_func, cmd_process]() { interact_func(cmd_process); }); [interact_func, cmd_process]() { interact_func(cmd_process); });
QObject::connect( QObject::connect(cmd_process, &QProcess::errorOccurred,
cmd_process, &QProcess::errorOccurred,
[=](QProcess::ProcessError error) { [=](QProcess::ProcessError error) {
SPDLOG_ERROR("error in executing command: {} error: {} stdout: {}", SPDLOG_ERROR(
"error in executing command: {} error: {} stdout: "
"{}, stderr: {} ",
cmd, error, cmd, error,
cmd_process->readAllStandardOutput().toStdString()); cmd_process->readAllStandardOutput().toStdString(),
cmd_process->readAllStandardError().toStdString());
}); });
QObject::connect( QObject::connect(
cmd_process, qOverload<int, QProcess::ExitStatus>(&QProcess::finished), cmd_process, qOverload<int, QProcess::ExitStatus>(&QProcess::finished),
[=](int, QProcess::ExitStatus status) { [=](int, QProcess::ExitStatus status) {
if (status == QProcess::NormalExit) if (status == QProcess::NormalExit)
SPDLOG_INFO("succeed in executing command: {}, exit status: {}", SPDLOG_DEBUG(
"proceess finished, succeed in executing command: {}, exit "
"status: {}",
cmd, status); cmd, status);
else else
SPDLOG_ERROR("error in executing command: {}, exit status: {}", cmd, SPDLOG_ERROR(
status); "proceess finished, error in executing command: {}, exit "
"status: {}, arguments: {}, stdout: {}, "
"stderr: {}",
cmd, status, cmd_process->arguments().join(" ").toStdString(),
cmd_process->readAllStandardOutput().toStdString(),
cmd_process->readAllStandardError().toStdString());
}); });
cmd_process->setProgram(QString::fromStdString(cmd)); cmd_process->setProgram(QString::fromStdString(cmd));

View File

@ -84,11 +84,11 @@ void GpgFrontend::Thread::TaskRunner::PostScheduleTask(Task* task,
if (task != nullptr) { if (task != nullptr) {
// Run the task // Run the task
SPDLOG_TRACE("task runner: running task: {}", task->GetUUID()); SPDLOG_TRACE("task runner: running task {}", task->GetUUID());
try { try {
task->run(); task->run();
} catch (const std::exception& e) { } catch (const std::exception& e) {
SPDLOG_ERROR("task runner: exception in task: {} , exception: {}", SPDLOG_ERROR("task runner: exception in task {}, exception: {}",
task->GetUUID(), e.what()); task->GetUUID(), e.what());
// destroy the task, remove the task from the pending tasks // destroy the task, remove the task from the pending tasks

View File

@ -164,9 +164,6 @@ void init_logging_system() {
ui_logger->flush_on(spdlog::level::err); ui_logger->flush_on(spdlog::level::err);
spdlog::flush_every(std::chrono::seconds(5)); spdlog::flush_every(std::chrono::seconds(5));
// register it
spdlog::register_logger(ui_logger);
// register it as default logger // register it as default logger
spdlog::set_default_logger(ui_logger); spdlog::set_default_logger(ui_logger);
} }
@ -193,7 +190,7 @@ void init_locale() {
// sync the settings to the file // sync the settings to the file
GpgFrontend::GlobalSettingStation::GetInstance().SyncSettings(); GpgFrontend::GlobalSettingStation::GetInstance().SyncSettings();
SPDLOG_INFO("current system locale: {}", setlocale(LC_ALL, nullptr)); SPDLOG_DEBUG("current system locale: {}", setlocale(LC_ALL, nullptr));
// read from settings file // read from settings file
std::string lang; std::string lang;
@ -201,9 +198,9 @@ void init_locale() {
SPDLOG_ERROR(_("could not read properly from configure file")); SPDLOG_ERROR(_("could not read properly from configure file"));
}; };
SPDLOG_INFO("lang from settings: {}", lang); SPDLOG_DEBUG("lang from settings: {}", lang);
SPDLOG_INFO("project name: {}", PROJECT_NAME); SPDLOG_DEBUG("project name: {}", PROJECT_NAME);
SPDLOG_INFO( SPDLOG_DEBUG(
"locales path: {}", "locales path: {}",
GpgFrontend::GlobalSettingStation::GetInstance().GetLocaleDir().c_str()); GpgFrontend::GlobalSettingStation::GetInstance().GetLocaleDir().c_str());
@ -218,7 +215,7 @@ void init_locale() {
// set LANGUAGE // set LANGUAGE
std::string language_env = language == nullptr ? "en" : language; std::string language_env = language == nullptr ? "en" : language;
language_env.insert(0, lang + ":"); language_env.insert(0, lang + ":");
SPDLOG_INFO("language env: {}", language_env); SPDLOG_DEBUG("language env: {}", language_env);
if (setenv("LANGUAGE", language_env.c_str(), 1)) { if (setenv("LANGUAGE", language_env.c_str(), 1)) {
SPDLOG_WARN("set LANGUAGE failed", language_env); SPDLOG_WARN("set LANGUAGE failed", language_env);
}; };
@ -236,7 +233,7 @@ void init_locale() {
std::string language_env = language == nullptr ? "en" : language; std::string language_env = language == nullptr ? "en" : language;
language_env.insert(0, lang + ":"); language_env.insert(0, lang + ":");
language_env.insert(0, "LANGUAGE="); language_env.insert(0, "LANGUAGE=");
SPDLOG_INFO("language env: {}", language_env); SPDLOG_DEBUG("language env: {}", language_env);
if (putenv(language_env.c_str())) { if (putenv(language_env.c_str())) {
spdlog::warn, "set LANGUAGE failed", language_env; spdlog::warn, "set LANGUAGE failed", language_env;
}; };