equal
deleted
inserted
replaced
21 # You should have received a copy of the GNU General Public License |
21 # You should have received a copy of the GNU General Public License |
22 # along with this program; if not, write to the Free Software |
22 # along with this program; if not, write to the Free Software |
23 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
23 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
24 |
24 |
25 |
25 |
26 import traceback |
|
27 from time import sleep |
26 from time import sleep |
28 import copy |
27 import copy |
29 import socket |
28 import socket |
30 import os.path |
29 import os.path |
31 |
30 |
76 confnodesroot._SetConnector(None) |
75 confnodesroot._SetConnector(None) |
77 confnodesroot.logger.write_error(_("Connection lost!\n")) |
76 confnodesroot.logger.write_error(_("Connection lost!\n")) |
78 except Pyro5.errors.ProtocolError as e: |
77 except Pyro5.errors.ProtocolError as e: |
79 confnodesroot.logger.write_error(_("Pyro exception: %s\n") % e) |
78 confnodesroot.logger.write_error(_("Pyro exception: %s\n") % e) |
80 except Exception as e: |
79 except Exception as e: |
81 # confnodesroot.logger.write_error(traceback.format_exc()) |
80 errmess = ''.join(Pyro5.errors.get_pyro_traceback()) |
82 errmess = ''.join(Pyro5.errors.get_pyro_traceback(e)) |
|
83 confnodesroot.logger.write_error(errmess + "\n") |
81 confnodesroot.logger.write_error(errmess + "\n") |
84 print(errmess) |
82 print(errmess) |
85 confnodesroot._SetConnector(None) |
83 confnodesroot._SetConnector(None) |
86 return default |
84 return default |
87 return catcher_func |
85 return catcher_func |