From 32b1efa17459924251cef713c81fb2bff236a562 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Fri, 21 May 2010 14:28:40 +0100
Subject: [PATCH] SingleFileEventHandler: Remove try/except blocks
Since now we use the SingleFileEventHandler together with an error
handling asyncore dispatcher, we don't need the internal try/except
anymore.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/asyncnotifier.py | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/lib/asyncnotifier.py b/lib/asyncnotifier.py
index 286cd2fd2..e60c26087 100644
--- a/lib/asyncnotifier.py
+++ b/lib/asyncnotifier.py
@@ -133,14 +133,7 @@ class SingleFileEventHandler(pyinotify.ProcessEvent):
# by the callback by calling "enable" again on us.
logging.debug("Received 'ignored' inotify event for %s", event.path)
self.watch_handle = None
-
- try:
- self.callback(False)
- except: # pylint: disable-msg=W0702
- # we need to catch any exception here, log it, but proceed, because even
- # if we failed handling a single request, we still want our daemon to
- # proceed.
- logging.error("Unexpected exception", exc_info=True)
+ self.callback(False)
# pylint: disable-msg=C0103
# this overrides a method in pyinotify.ProcessEvent
@@ -150,14 +143,7 @@ class SingleFileEventHandler(pyinotify.ProcessEvent):
# replacing any file with a new one, at filesystem level, rather than
# actually changing it. (see utils.WriteFile)
logging.debug("Received 'modify' inotify event for %s", event.path)
-
- try:
- self.callback(True)
- except: # pylint: disable-msg=W0702
- # we need to catch any exception here, log it, but proceed, because even
- # if we failed handling a single request, we still want our daemon to
- # proceed.
- logging.error("Unexpected exception", exc_info=True)
+ self.callback(True)
def process_default(self, event):
logging.error("Received unhandled inotify event: %s", event)
--
GitLab