From 14dc1773ce6cd110869d4957b2b9d4e3c2afd965 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 18 Jul 2012 15:08:28 -0400 Subject: made inotify FAM work. i think. --- src/lib/Bcfg2/Server/FileMonitor/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/lib/Bcfg2/Server/FileMonitor/__init__.py') diff --git a/src/lib/Bcfg2/Server/FileMonitor/__init__.py b/src/lib/Bcfg2/Server/FileMonitor/__init__.py index 8bd63e18d..c490acc81 100644 --- a/src/lib/Bcfg2/Server/FileMonitor/__init__.py +++ b/src/lib/Bcfg2/Server/FileMonitor/__init__.py @@ -44,12 +44,15 @@ class FileMonitor(object): def __repr__(self): return "%s (%s events, fd %s)" % (str(self), len(self.events), self.fileno) + def debug_log(self, msg): + if self.debug: + logger.info(msg) + def should_ignore(self, event): for pattern in self.ignore: if (fnmatch.fnmatch(event.filename, pattern) or fnmatch.fnmatch(os.path.split(event.filename)[-1], pattern)): - if self.debug: - logger.info("Ignoring %s" % event) + self.debug_log("Ignoring %s" % event) return True return False @@ -69,10 +72,9 @@ class FileMonitor(object): logger.info("Got event for unexpected id %s, file %s" % (event.requestID, event.filename)) return - if self.debug: - logger.info("Dispatching event %s %s to obj %s" % - (event.code2str(), event.filename, - self.handles[event.requestID])) + self.debug_log("Dispatching event %s %s to obj %s" % + (event.code2str(), event.filename, + self.handles[event.requestID])) try: self.handles[event.requestID].HandleEvent(event) except: -- cgit v1.2.3-1-g7c22