equal
deleted
inserted
replaced
110 """ |
110 """ |
111 def catcher_func(*args, **kwargs): |
111 def catcher_func(*args, **kwargs): |
112 try: |
112 try: |
113 return func(*args, **kwargs) |
113 return func(*args, **kwargs) |
114 except Pyro.errors.ConnectionClosedError, e: |
114 except Pyro.errors.ConnectionClosedError, e: |
115 confnodesroot.logger.write_error("Connection lost!\n") |
115 confnodesroot.logger.write_error(_("Connection lost!\n")) |
116 confnodesroot._SetConnector(None) |
116 confnodesroot._SetConnector(None) |
117 except Pyro.errors.ProtocolError, e: |
117 except Pyro.errors.ProtocolError, e: |
118 confnodesroot.logger.write_error("Pyro exception: " + str(e) + "\n") |
118 confnodesroot.logger.write_error(_("Pyro exception: %s\n") % e) |
119 except Exception, e: |
119 except Exception, e: |
120 # confnodesroot.logger.write_error(traceback.format_exc()) |
120 # confnodesroot.logger.write_error(traceback.format_exc()) |
121 errmess = ''.join(Pyro.util.getPyroTraceback(e)) |
121 errmess = ''.join(Pyro.util.getPyroTraceback(e)) |
122 confnodesroot.logger.write_error(errmess + "\n") |
122 confnodesroot.logger.write_error(errmess + "\n") |
123 print errmess |
123 print errmess |