From ef4ca33b77b510abfa77192bdc7af5500b3f08cc Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Sun, 23 Aug 2009 16:57:48 +0100
Subject: [PATCH] ConfdInotifyEventHandler.enable: use InotifyError
Rather than raising ConfdFatalError directly
ConfdInotifyEventHandler.enable raises InotifyError should it not be
able to configure inotify, allowing the caller to decide what to do.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
daemons/ganeti-confd | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/daemons/ganeti-confd b/daemons/ganeti-confd
index 9deb1232f..34d08f33a 100755
--- a/daemons/ganeti-confd
+++ b/daemons/ganeti-confd
@@ -123,7 +123,7 @@ class ConfdInotifyEventHandler(pyinotify.ProcessEvent):
if self.watch_handle is None:
result = self.watch_manager.add_watch(self.file, self.mask)
if not self.file in result or result[self.file] <= 0:
- raise errors.ConfdFatalError("Could not add inotify watcher")
+ raise errors.InotifyError("Could not add inotify watcher")
else:
self.watch_handle = result[self.file]
@@ -213,7 +213,10 @@ class ConfdConfigurationReloader(object):
"""
if not notifier_enabled:
- self.inotify_handler.enable()
+ try:
+ self.inotify_handler.enable()
+ except errors.InotifyError:
+ raise errors.ConfdFatalError(err)
try:
reloaded = self.reader.Reload()
--
GitLab