mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: reduce log files; no need to log out if nothing changes; switch log level to info 

jira: [none]
Change-Id: I72066576085fd99a032383cb52f24f2e87adb9c3
This commit is contained in:
xin.zhang 2025-03-27 15:51:38 +08:00 committed by lane.wei
parent e22137e20e
commit 40183c4074
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/slic3r/GUI/DeviceManager.cpp
View File

@ -6827,12 +6827,10 @@ void DeviceManager::check_pushing()
} }
} }
void DeviceManager::on_machine_alive(std::string json_str) void DeviceManager::on_machine_alive(std::string json_str)
{ {
try { try {
BOOST_LOG_TRIVIAL(trace) << "DeviceManager::SsdpDiscovery, json" << json_str; //BOOST_LOG_TRIVIAL(trace) << "DeviceManager::SsdpDiscovery, json" << json_str;
json j = json::parse(json_str); json j = json::parse(json_str);
std::string dev_name = j["dev_name"].get<std::string>(); std::string dev_name = j["dev_name"].get<std::string>();
std::string dev_id = j["dev_id"].get<std::string>(); std::string dev_id = j["dev_id"].get<std::string>();
@ -6865,11 +6863,19 @@ void DeviceManager::on_machine_alive(std::string json_str)
/* update userMachineList info */ /* update userMachineList info */
auto it = userMachineList.find(dev_id); auto it = userMachineList.find(dev_id);
if (it != userMachineList.end()) { if (it != userMachineList.end()) {
if (it->second->dev_ip != dev_ip ||
it->second->bind_state != bind_state ||
it->second->bind_sec_link != sec_link ||
it->second->dev_connection_type != connect_type ||
it->second->bind_ssdp_version != ssdp_version)
{
it->second->dev_ip = dev_ip; it->second->dev_ip = dev_ip;
it->second->bind_state = bind_state; it->second->bind_state = bind_state;
it->second->bind_sec_link = sec_link; it->second->bind_sec_link = sec_link;
it->second->dev_connection_type = connect_type; it->second->dev_connection_type = connect_type;
it->second->bind_ssdp_version = ssdp_version; it->second->bind_ssdp_version = ssdp_version;
BOOST_LOG_TRIVIAL(trace) << "DeviceManager::SsdpDiscovery, update userMachineList json" << json_str;
}
} }
/* update localMachineList */ /* update localMachineList */
@ -6895,19 +6901,27 @@ void DeviceManager::on_machine_alive(std::string json_str)
/* ip changed reconnect mqtt */ /* ip changed reconnect mqtt */
} }
if (obj->wifi_signal != printer_signal ||
obj->dev_connection_type != connect_type ||
obj->bind_state != bind_state ||
obj->bind_sec_link != sec_link ||
obj->bind_ssdp_version != ssdp_version ||
obj->printer_type != MachineObject::parse_printer_type(printer_type_str))
{
obj->wifi_signal = printer_signal; obj->wifi_signal = printer_signal;
obj->dev_connection_type = connect_type; obj->dev_connection_type = connect_type;
obj->bind_state = bind_state; obj->bind_state = bind_state;
obj->bind_sec_link = sec_link; obj->bind_sec_link = sec_link;
obj->bind_ssdp_version = ssdp_version; obj->bind_ssdp_version = ssdp_version;
obj->printer_type = MachineObject::parse_printer_type(printer_type_str); obj->printer_type = MachineObject::parse_printer_type(printer_type_str);
BOOST_LOG_TRIVIAL(trace) << "DeviceManager::SsdpDiscovery, update localMachineList json" << json_str;
}
// U0 firmware // U0 firmware
if (obj->dev_connection_type.empty() && obj->bind_state.empty()) if (obj->dev_connection_type.empty() && obj->bind_state.empty())
obj->bind_state = "free"; obj->bind_state = "free";
BOOST_LOG_TRIVIAL(debug) << "SsdpDiscovery:: Update Machine Info, printer_sn = " << dev_id << ", signal = " << printer_signal; //BOOST_LOG_TRIVIAL(debug) << "SsdpDiscovery:: Update Machine Info, printer_sn = " << dev_id << ", signal = " << printer_signal;
obj->last_alive = Slic3r::Utils::get_current_time_utc(); obj->last_alive = Slic3r::Utils::get_current_time_utc();
obj->m_is_online = true; obj->m_is_online = true;
@ -6940,7 +6954,9 @@ void DeviceManager::on_machine_alive(std::string json_str)
Slic3r::GUI::wxGetApp().app_config->set_str("ip_address", obj->dev_id, obj->dev_ip); Slic3r::GUI::wxGetApp().app_config->set_str("ip_address", obj->dev_id, obj->dev_ip);
Slic3r::GUI::wxGetApp().app_config->save(); Slic3r::GUI::wxGetApp().app_config->save();
}*/ }*/
BOOST_LOG_TRIVIAL(info) << "SsdpDiscovery::New Machine, ip = " << Slic3r::GUI::wxGetApp().format_IP(dev_ip) << ", printer_name= " << dev_name << ", printer_type = " << printer_type_str << ", signal = " << printer_signal; BOOST_LOG_TRIVIAL(info) << "SsdpDiscovery::New Machine, ip= " << Slic3r::GUI::wxGetApp().format_IP(dev_ip) << ", printer_name= " << dev_name
<< ", printer_type= " << printer_type_str << ", con_type= "
<< connect_type <<", signal= " << printer_signal << ", bind_state= " << bind_state;
} }
} }
catch (...) { catch (...) {