diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Lint')
| -rw-r--r-- | src/lib/Bcfg2/Server/Lint/Cfg.py | 33 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Lint/Comments.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Lint/__init__.py | 2 |
3 files changed, 28 insertions, 10 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/Cfg.py b/src/lib/Bcfg2/Server/Lint/Cfg.py index 933e677e0..4cdf5c48a 100644 --- a/src/lib/Bcfg2/Server/Lint/Cfg.py +++ b/src/lib/Bcfg2/Server/Lint/Cfg.py @@ -37,22 +37,41 @@ class Cfg(ServerPlugin): "%s has no corresponding pubkey.xml at %s" % (basename, pubkey)) + def _list_path_components(self, path): + """ Get a list of all components of a path. E.g., + ``self._list_path_components("/foo/bar/foobaz")`` would return + ``["foo", "bar", "foo", "baz"]``. The list is not guaranteed + to be in order.""" + rv = [] + remaining, component = os.path.split(path) + while component != '': + rv.append(component) + remaining, component = os.path.split(remaining) + return rv + def check_missing_files(self): """ check that all files on the filesystem are known to Cfg """ cfg = self.core.plugins['Cfg'] # first, collect ignore patterns from handlers - ignore = [] - for hdlr in cfg.handlers: - ignore.extend(hdlr.__ignore__) + ignore = set() + for hdlr in handlers(): + ignore.update(hdlr.__ignore__) # next, get a list of all non-ignored files on the filesystem all_files = set() for root, _, files in os.walk(cfg.data): - all_files.update(os.path.join(root, fname) - for fname in files - if not any(fname.endswith("." + i) - for i in ignore)) + for fname in files: + fpath = os.path.join(root, fname) + # check against the handler ignore patterns and the + # global FAM ignore list + if (not any(fname.endswith("." + i) for i in ignore) and + not any(fnmatch(fpath, p) + for p in self.config['ignore']) and + not any(fnmatch(c, p) + for p in self.config['ignore'] + for c in self._list_path_components(fpath))): + all_files.add(fpath) # next, get a list of all files known to Cfg cfg_files = set() diff --git a/src/lib/Bcfg2/Server/Lint/Comments.py b/src/lib/Bcfg2/Server/Lint/Comments.py index c9a34a75f..e2d1ec597 100644 --- a/src/lib/Bcfg2/Server/Lint/Comments.py +++ b/src/lib/Bcfg2/Server/Lint/Comments.py @@ -90,8 +90,7 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin): Bcfg2.Options.Option( cf=("Comments", "probe_comments"), type=Bcfg2.Options.Types.comma_list, default=[], - help="Required comments for probes") - ] + help="Required comments for probes")] def __init__(self, *args, **kwargs): Bcfg2.Server.Lint.ServerPlugin.__init__(self, *args, **kwargs) diff --git a/src/lib/Bcfg2/Server/Lint/__init__.py b/src/lib/Bcfg2/Server/Lint/__init__.py index 26de28e7c..4f64fd006 100644 --- a/src/lib/Bcfg2/Server/Lint/__init__.py +++ b/src/lib/Bcfg2/Server/Lint/__init__.py @@ -429,7 +429,7 @@ class CLI(object): """ run plugins that require a running server to run """ core = Bcfg2.Server.Core.Core() core.load_plugins() - core.fam.handle_events_in_interval(0.1) + core.block_for_fam_events(handle_events=True) try: self.logger.debug("Running server plugins: %s" % [p.__name__ for p in self.serverplugins]) |