From b11dc8dc0b60422ec758b1096c93674cad09a562 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Fri, 15 Sep 2006 15:50:56 +0000 Subject: Implement upstream event suppression with logging (Resolves Ticket #111) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2264 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Core.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index 6f11e83e7..00d7d41cb 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -9,6 +9,16 @@ import logging, lxml.etree, os, stat, Bcfg2.Server.Metadata, ConfigParser logger = logging.getLogger('Bcfg2.Core') +def ShouldIgnore(event): + '''Test if the event should be suppresed''' + if event.filename.split('/')[-1] == '.svn': + return True + if event.filename.endswith('~') or event.filename.endswith('.tmp') + or event.filename.endswith('.tmp'): + logger.error("Suppressing event for file %s" % (event.filename)) + return True + return False + class CoreInitError(Exception): '''This error is raised when the core cannot be initialized''' pass @@ -66,8 +76,7 @@ class FamFam(object): unique = [] bookkeeping = [] for event in rawevents: - if event.filename.split('/')[-1] == '.svn': - # ignore svn directories + if ShouldIgnore(event): continue if event.code2str() != 'changed': # process all non-change events @@ -148,8 +157,7 @@ class GaminFam(object): unique = [] bookkeeping = [] for event in self.events: - if event.filename.split('/')[-1] == '.svn': - # skip svn directories + if ShouldIgnore(event): continue if event.code2str() != 'changed': # process all non-change events -- cgit v1.2.3-1-g7c22