From b9870f2e9293491a2f17b1c3bbd4e1bc2d505704 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 18 Sep 2012 15:04:04 -0400 Subject: fixed gamin issues with late daemonization --- src/lib/Bcfg2/Server/FileMonitor/Gamin.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'src/lib/Bcfg2/Server/FileMonitor/Gamin.py') diff --git a/src/lib/Bcfg2/Server/FileMonitor/Gamin.py b/src/lib/Bcfg2/Server/FileMonitor/Gamin.py index 60f80c9c3..8a72fc0eb 100644 --- a/src/lib/Bcfg2/Server/FileMonitor/Gamin.py +++ b/src/lib/Bcfg2/Server/FileMonitor/Gamin.py @@ -9,6 +9,7 @@ from Bcfg2.Server.FileMonitor import Event, FileMonitor logger = logging.getLogger(__name__) + class GaminEvent(Event): """ This class provides an event analogous to @@ -23,13 +24,22 @@ class GaminEvent(Event): if code in self.action_map: self.action = self.action_map[code] + class Gamin(FileMonitor): __priority__ = 10 def __init__(self, ignore=None, debug=False): FileMonitor.__init__(self, ignore=ignore, debug=debug) - self.mon = WatchMonitor() + self.mon = None self.counter = 0 + self.add_q = [] + + def start(self): + FileMonitor.start(self) + self.mon = WatchMonitor() + for monitor in self.add_q: + self.AddMonitor(*monitor) + self.add_q = [] def fileno(self): return self.mon.get_fd() @@ -38,10 +48,16 @@ class Gamin(FileMonitor): """queue up the event for later handling""" self.events.append(GaminEvent(request_id, path, action)) - def AddMonitor(self, path, obj): + def AddMonitor(self, path, obj, handle=None): """Add a monitor to path, installing a callback to obj.""" - handle = self.counter - self.counter += 1 + if handle is None: + handle = self.counter + self.counter += 1 + + if not self.started: + self.add_q.append((path, obj, handle)) + return handle + mode = os.stat(path)[stat.ST_MODE] # Flush queued gamin events -- cgit v1.2.3-1-g7c22