3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 23:46:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

If a timeout lasted to long without update, we only re-create network interface once

Browse source 
CURA-2295
This commit is contained in:
Jaime van Kessel 2016-09-07 12:58:48 +02:00
parent 93cc25b408
commit d0823fda11
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
NetworkPrinterOutputDevice.py
View file

@ -231,13 +231,21 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
## Request data from the connected device. ## Request data from the connected device.
def _update(self): def _update(self):
if self._last_response_time:
time_since_last_response = time() - self._last_response_time
else:
time_since_last_response = 0
# Connection is in timeout, check if we need to re-start the connection. # Connection is in timeout, check if we need to re-start the connection.
# Sometimes the qNetwork manager incorrectly reports the network status on Mac & Windows. # Sometimes the qNetwork manager incorrectly reports the network status on Mac & Windows.
# Re-creating the QNetworkManager seems to fix this issue. # Re-creating the QNetworkManager seems to fix this issue.
if self._last_response_time and self._connection_state_before_timeout: if self._last_response_time and self._connection_state_before_timeout:
if time() - self._last_response_time > self._recreate_network_manager_time * self._recreate_network_manager_count: if time_since_last_response > self._recreate_network_manager_time * self._recreate_network_manager_count:
self._recreate_network_manager_count += 1 # It can happen that we had a very long timeout (multiple times the recreate time).
Logger.log("d", "Timeout lasted over 30 seconds (%.1fs), re-checking connection.", (time() - self._last_response_time)) # In that case we should jump through the point that the next update won't be right away.
while time_since_last_response - self._recreate_network_manager_time * self._recreate_network_manager_count > self._recreate_network_manager_time:
self._recreate_network_manager_count += 1
Logger.log("d", "Timeout lasted over 30 seconds (%.1fs), re-checking connection.", time_since_last_response)
self._createNetworkManager() self._createNetworkManager()
return return
@ -268,9 +276,9 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
# Check that we aren't in a timeout state # Check that we aren't in a timeout state
if self._last_response_time and not self._connection_state_before_timeout: if self._last_response_time and not self._connection_state_before_timeout:
if time() - self._last_response_time > self._response_timeout_time: if time_since_last_response > self._response_timeout_time:
# Go into timeout state. # Go into timeout state.
Logger.log("d", "We did not receive a response for %0.1f seconds, so it seems the printer is no longer accessible.", time() - self._last_response_time) Logger.log("d", "We did not receive a response for %0.1f seconds, so it seems the printer is no longer accessible.", time_since_last_response)
self._connection_state_before_timeout = self._connection_state self._connection_state_before_timeout = self._connection_state
self._connection_message = Message(i18n_catalog.i18nc("@info:status", "The connection with the printer was lost. Check your printer to see if it is connected.")) self._connection_message = Message(i18n_catalog.i18nc("@info:status", "The connection with the printer was lost. Check your printer to see if it is connected."))
self._connection_message.show() self._connection_message.show()