Mercurial > xib

comparison bridge.py @ 191:ac89a4a72a62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed buggy exception catch in bridge.py Signed-off-by: Charly COSTE <changaco@changaco.net>
author Charly COSTE <changaco@changaco.net>
date Sun, 21 Feb 2010 12:08:42 +0100
parents 6db99e458168
children 12fa9bb73b1d
comparison
equal deleted inserted replaced
190:6db99e458168 191:ac89a4a72a62
151 pass 151 pass
152 152
153 if nickname == 'ChanServ' and from_protocol == 'irc': 153 if nickname == 'ChanServ' and from_protocol == 'irc':
154 return 154 return
155 155
156 self.lock.acquire()
157 self.bot.error(3, 'adding participant "'+nickname+'" from "'+from_protocol+'" to bridge "'+str(self)+'"', debug=True) 156 self.bot.error(3, 'adding participant "'+nickname+'" from "'+from_protocol+'" to bridge "'+str(self)+'"', debug=True)
158 try: 157 try:
159 p = Participant(self, from_protocol, nickname, real_jid=real_jid) 158 p = Participant(self, from_protocol, nickname, real_jid=real_jid)
160 except IOError:
161 self.bot.error(3, 'IOError while adding participant "'+nickname+'" from "'+from_protocol+'" to bridge "'+str(self)+'", reconnectiong ...', debug=True)
162 p.xmpp_c.reconnectAndReauth()
163 except: 159 except:
164 self.bot.error(3, 'unknown error while adding participant "'+nickname+'" from "'+from_protocol+'" to bridge "'+str(self)+'"', debug=True) 160 self.bot.error(3, 'unknown error while adding participant "'+nickname+'" from "'+from_protocol+'" to bridge "'+str(self)+'"', debug=True)
165 traceback.print_exc() 161 traceback.print_exc()
166 return 162 return
163 self.lock.acquire()
167 self.participants.append(p) 164 self.participants.append(p)
168 self.lock.release() 165 self.lock.release()
169 if self.mode not in ['normal', 'bypass']: 166 if self.mode not in ['normal', 'bypass']:
170 if from_protocol == 'xmpp': 167 if from_protocol == 'xmpp':
171 self.show_participants_list_on(protocols=['irc']) 168 self.show_participants_list_on(protocols=['irc'])