diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-13 07:12:44 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-13 07:12:44 -0500 |
| commit | 75b79b5286615244ae7a5a744edfea88ecef1fdc (patch) | |
| tree | 9a833c029c3b907ca1d3a0bf786c35c71c0bd11a /src/lib/Bcfg2/Server/Core.py | |
| parent | 20895b7d21c12a067e7da39e6a2b85afc1cda114 (diff) | |
| download | bcfg2-75b79b5286615244ae7a5a744edfea88ecef1fdc.tar.gz bcfg2-75b79b5286615244ae7a5a744edfea88ecef1fdc.tar.bz2 bcfg2-75b79b5286615244ae7a5a744edfea88ecef1fdc.zip | |
Core: handle errors in FAM thread more verbosely
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 4ad154b50..398053374 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -292,17 +292,21 @@ class Core(object): famfd = self.fam.fileno() terminate = self.terminate while not terminate.isSet(): - try: - if famfd: - select.select([famfd], [], [], 2) - else: - if not self.fam.pending(): - terminate.wait(15) - if self.fam.pending(): + if famfd: + select.select([famfd], [], [], 2) + elif not self.fam.pending(): + terminate.wait(15) + if self.fam.pending(): + try: self._update_vcs_revision() + except: + self.logger.error("Error updating VCS revision: %s" % + sys.exc_info()[1]) + try: self.fam.handle_event_set(self.lock) except: - continue + self.logger.error("Error handling event set: %s" % + sys.exc_info()[1]) self.logger.info("File monitor thread terminated") @track_statistics() |