Исправлено переподключение к calculate-core

master3.3 3.2.2
Mike Khiretskiy 10 years ago
parent 822860e360
commit ba971080ec

@ -257,7 +257,6 @@ class MainWgt(QtGui.QMainWindow):
return 0
def reconnect_to_host(self):
self.sender().setDisabled(True)
self.ClientObj.app.processEvents()
server_host_name = self.ClientObj.client.server_host_name
password = self.ClientObj.client.password
@ -267,7 +266,7 @@ class MainWgt(QtGui.QMainWindow):
# Reconnet to current host
self.cur_size = self.size()
self.ConnectWidget = FrameConnection(self, self.ClientObj)
self.ConnectWidget.connect_to_host(server_host_name, \
self.ConnectWidget.connect_to_host(server_host_name,
self.ClientObj.port, re_passwd=password)
if not self.main_frame.isEnabled():
@ -374,12 +373,13 @@ class MainWgt(QtGui.QMainWindow):
self.con_lost_lbl.close()
self.con_lost_lbl = ConnectLostLabel \
(_("The server was restarted.") + '\n' + \
_('Please try reconnecting to the server.'),
self, True)
_('Reconnecting to the server.'),
self)
self.topmenu.Processes.setDisabled(True)
self.topmenu.Session.setDisabled(True)
self.topmenu.Back.setDisabled(True)
self.con_lost_lbl.show()
self.reconnect_to_host()
def resizeEvent(self, event):
if hasattr (self, 'con_lost_lbl'):

@ -513,6 +513,8 @@ class MainFrameRes(QtGui.QWidget):
def get_message(self, item, sid, pid):
try:
if item.type == "error" and item.message == "403 Forbidden":
return 0
if self.cur_pid != pid:
return 1
except:
@ -608,6 +610,24 @@ class MainFrameRes(QtGui.QWidget):
through_object = (sid, pid))
self.get_Frame_thread.signal_extended.connect(self.get_Frame_cycle)
self.get_Frame_thread.start()
def get_errno(self, exception):
"""
Exception container with URLError
"""
from urllib2 import URLError
from socket import error as socket_error
try:
if (exception.args and type(exception.args[0]) == URLError and
exception.args[0].args and
type(exception.args[0].args[0]) == socket_error):
return exception.args[0].args[0].errno
if (exception.args[0].args and
type(exception.args[0].args[0]) == socket_error):
return exception.args[0].errno
except:
return None
return None
def get_Frame_cycle(self, current_frame, through_object):
if type(current_frame) == Exception:
@ -629,7 +649,10 @@ class MainFrameRes(QtGui.QWidget):
if self.get_Frame_thread.isRunning():
self.get_Frame_thread.wait()
if self.ClientObj.host_name in ('localhost','127.0.0.1'):
sleeptime = 0
if self.get_errno(current_frame) == 111:
sleeptime = 5
else:
sleeptime = 0
else:
sleeptime = int(self.ClientObj.client.frame_period)
self.get_Frame_thread = ClientServiceThread(self.ClientObj,

Loading…
Cancel
Save