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

Fixed timeout implementation

Browse source 
Turned out that QT timeout wasn't triggred at all, so we're now keeping track
of this with our own timer

CURA-1851
This commit is contained in:
Jaime van Kessel 2016-07-21 11:58:35 +02:00
parent 01f051b82a
commit 0df2543f1a
1 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

26
NetworkPrinterOutputDevice.py
View file

@ -16,6 +16,8 @@ from PyQt5.QtGui import QImage
import json import json
import os import os
from time import time
i18n_catalog = i18nCatalog("cura") i18n_catalog = i18nCatalog("cura")
from enum import IntEnum from enum import IntEnum
@ -104,6 +106,10 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._camera_image = QImage() self._camera_image = QImage()
self._material_post_objects = {} self._material_post_objects = {}
self._connection_state_before_timeout = None
self._last_response_time = time()
self._timeout_time = 10
def _onAuthenticationTimer(self): def _onAuthenticationTimer(self):
self._authentication_counter += 1 self._authentication_counter += 1
@ -178,6 +184,14 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
## Request data from the connected device. ## Request data from the connected device.
def _update(self): def _update(self):
# Check that we aren't in a timeout state
if self._last_response_time and not self._connection_state_before_timeout:
if time() - self._last_response_time > self._timeout_time:
# Go into timeout state.
Logger.log("d", "We did not recieve a response for %s seconds, so it seems the printer is no longer accesible.", time() - self._last_response_time)
self._connection_state_before_timeout = self._connection_state
self.setConnectionState(ConnectionState.error)
if self._authentication_state == AuthState.NotAuthenticated: if self._authentication_state == AuthState.NotAuthenticated:
self._verifyAuthentication() # We don't know if we are authenticated; check if we have correct auth. self._verifyAuthentication() # We don't know if we are authenticated; check if we have correct auth.
elif self._authentication_state == AuthState.AuthenticationRequested: elif self._authentication_state == AuthState.AuthenticationRequested:
@ -390,8 +404,20 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
def _onFinished(self, reply): def _onFinished(self, reply):
if reply.error() == QNetworkReply.TimeoutError: if reply.error() == QNetworkReply.TimeoutError:
Logger.log("w", "Received a timeout on a request to the printer") Logger.log("w", "Received a timeout on a request to the printer")
self._connection_state_before_timeout = self._connection_state
self.setConnectionState(ConnectionState.error)
return return
if self._connection_state_before_timeout and reply.error() == QNetworkReply.NoError: # There was a timeout, but we got a correct answer again.
Logger.log("d", "We got a response from the server after %s of silence", time() - self._last_response_time )
self.setConnectionState(self._connection_state_before_timeout)
self._connection_state_before_timeout = None
if reply.error() == QNetworkReply.NoError:
self._last_response_time = time()
else:
return # Error in the reply, drop it.
status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute)
if reply.operation() == QNetworkAccessManager.GetOperation: if reply.operation() == QNetworkAccessManager.GetOperation:
if "printer" in reply.url().toString(): # Status update from printer. if "printer" in reply.url().toString(): # Status update from printer.