Changeset 2027

Timestamp:

07/24/08 11:37:05

Author:

fumanchu

Message:

Avoid infinite loop when errors occur during publish('log').

Files:

• trunk/cherrypy/process/wspbus.py (modified) (1 diff)

trunk/cherrypy/process/wspbus.py

@@ -154 +154 @@
-                raise
-            except:
-                self.log("Error in %r listener %r" % (channel, listener),
-                         level=40, traceback=True)
-                exc = sys.exc_info()[1]
+                if channel == 'log':
+                    # Assume any further messages to 'log' will fail.
+                    pass
+                else:
+                    self.log("Error in %r listener %r" % (channel, listener),
+                             level=40, traceback=True)
-        if exc:
-            raise