Mercurial > xib

comparison bridge.py @ 251:49c57daff4d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fix in Bridge, don't log the same error twice Signed-off-by: Charly COSTE <changaco@changaco.net>
author Charly COSTE <changaco@changaco.net>
date Mon, 08 Mar 2010 23:41:37 +0100
parents 430eb5052e4d
children 3b318108e9e0
comparison
equal deleted inserted replaced
250:5d6ff929e6bc 251:49c57daff4d7
130 except xmpp.muc.RemoteServerNotFound: 130 except xmpp.muc.RemoteServerNotFound:
131 self._RemoteServerNotFound_handler() 131 self._RemoteServerNotFound_handler()
132 except: 132 except:
133 trace = traceback.format_exc() 133 trace = traceback.format_exc()
134 self.bot.error(say_levels.error, 'failed to connect to the XMPP room of bridge "'+str(self)+'", stopping bridge\n'+trace, send_to_admins=True) 134 self.bot.error(say_levels.error, 'failed to connect to the XMPP room of bridge "'+str(self)+'", stopping bridge\n'+trace, send_to_admins=True)
135 self.stop(message='Failed to connect to the XMPP room, stopping bridge') 135 self.stop(message='Failed to connect to the XMPP room, stopping bridge', log=False)
136 136
137 137
138 def add_participant(self, from_protocol, nickname, real_jid=None): 138 def add_participant(self, from_protocol, nickname, real_jid=None):
139 """Add a participant to the bridge.""" 139 """Add a participant to the bridge."""
140 if (from_protocol == 'irc' and nickname == self.bot.nickname) or (from_protocol == 'xmpp' and nickname == self.bot.nickname): 140 if (from_protocol == 'irc' and nickname == self.bot.nickname) or (from_protocol == 'xmpp' and nickname == self.bot.nickname):