From 8d34e22d7fa480887a941b9fe6ad5b310b1cc29a Mon Sep 17 00:00:00 2001
From: SoftFever <softfeverever@gmail.com>
Date: Sun, 17 Mar 2024 23:06:42 +0800
Subject: [PATCH] log tweak: 1. deprecate severity_level, use
 log_severity_level config key 2. remove encrytped bbl debug_network log file

---
 src/libslic3r/AppConfig.cpp        |  5 +++--
 src/slic3r/GUI/GUI_App.cpp         | 24 +++++++++++++++++++++++-
 src/slic3r/GUI/MainFrame.cpp       |  2 +-
 src/slic3r/GUI/Preferences.cpp     |  4 ++--
 src/slic3r/Utils/PresetUpdater.cpp |  2 +-
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
index a9f7d7c8e..e474ca642 100644
--- a/src/libslic3r/AppConfig.cpp
+++ b/src/libslic3r/AppConfig.cpp
@@ -224,8 +224,8 @@ void AppConfig::set_defaults()
     if (get("enable_ssl_for_ftp").empty())
         set_bool("enable_ssl_for_ftp", true);
 
-    if (get("severity_level").empty())
-        set("severity_level", "2");
+    if (get("log_severity_level").empty())
+        set("log_severity_level", "warning");
 
     if (get("internal_developer_mode").empty())
         set_bool("internal_developer_mode", false);
@@ -384,6 +384,7 @@ void AppConfig::set_defaults()
     erase("app", "object_settings_maximized");
     erase("app", "object_settings_pos");
     erase("app", "object_settings_size");
+    erase("app", "severity_level");
 }
 
 #ifdef WIN32
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 41fa9ea43..970f4ea22 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -2169,7 +2169,7 @@ void GUI_App::init_app_config()
         }
 #endif // _WIN32
     }
-    set_logging_level(Slic3r::level_string_to_boost(app_config->get("severity_level")));
+    set_logging_level(Slic3r::level_string_to_boost(app_config->get("log_severity_level")));
 
 }
 
@@ -2297,6 +2297,28 @@ int GUI_App::OnExit()
         m_agent = nullptr;
     }
 
+    // Orca: clean up encrypted bbl network log file if plugin is used
+    // No point to keep them as they are encrypted and can't be used for debugging
+    try {
+        auto              log_folder  = boost::filesystem::path(data_dir()) / "log";
+        const std::string filePattern = R"(debug_network_.*\.log\.enc)";
+        std::regex        pattern(filePattern);
+        if (boost::filesystem::exists(log_folder)) {
+            std::vector<boost::filesystem::path> network_logs;
+            for (auto& it : boost::filesystem::directory_iterator(log_folder)) {
+                auto temp_path = it.path();
+                if (boost::filesystem::is_regular_file(temp_path) && std::regex_match(temp_path.filename().string(), pattern)) {
+                    network_logs.push_back(temp_path.filename());
+                }
+            }
+            for (auto f : network_logs) {
+                boost::filesystem::remove(f);
+            }
+        }
+    } catch (...) {
+        BOOST_LOG_TRIVIAL(error) << "Failed to clean up encrypt bbl network log file";
+    }
+
     return wxApp::OnExit();
 }
 
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index 984fa5e3f..84f05c422 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -207,7 +207,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
         set_max_recent_count((int)max_recent_count);
 
     //reset log level
-    auto loglevel = wxGetApp().app_config->get("severity_level");
+    auto loglevel = wxGetApp().app_config->get("log_severity_level");
     Slic3r::set_logging_level(Slic3r::level_string_to_boost(loglevel));
 
     // BBS
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index 8babf1038..3e0cf0769 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -351,7 +351,7 @@ wxBoxSizer *PreferencesDialog::create_item_loglevel_combobox(wxString title, wxW
     std::vector<wxString>::iterator iter;
     for (iter = vlist.begin(); iter != vlist.end(); iter++) { combobox->Append(*iter); }
 
-    auto severity_level = app_config->get("severity_level");
+    auto severity_level = app_config->get("log_severity_level");
     if (!severity_level.empty()) { combobox->SetValue(severity_level); }
 
     m_sizer_combox->Add(combobox, 0, wxALIGN_CENTER, 0);
@@ -360,7 +360,7 @@ wxBoxSizer *PreferencesDialog::create_item_loglevel_combobox(wxString title, wxW
     combobox->GetDropDown().Bind(wxEVT_COMBOBOX, [this](wxCommandEvent &e) {
         auto level = Slic3r::get_string_logging_level(e.GetSelection());
         Slic3r::set_logging_level(Slic3r::level_string_to_boost(level));
-        app_config->set("severity_level",level);
+        app_config->set("log_severity_level",level);
         e.Skip();
      });
     return m_sizer_combox;
diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp
index bb6197847..2a7ba5231 100644
--- a/src/slic3r/Utils/PresetUpdater.cpp
+++ b/src/slic3r/Utils/PresetUpdater.cpp
@@ -677,7 +677,7 @@ void PresetUpdater::priv::sync_config()
                     }
                 } catch (...) {}
             }
-            BOOST_LOG_TRIVIAL(error) << format("Error getting: `%1%`: HTTP %2%, %3%", "sync_config_orca", http_status, error);
+            BOOST_LOG_TRIVIAL(info) << format("Error getting: `%1%`: HTTP %2%, %3%", "sync_config_orca", http_status, error);
         })
         .timeout_connect(5)
         .on_complete([this, asset_name, cache_profile_path, cache_profile_update_file](std::string body, unsigned http_status) {