summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Laszlo <tim.laszlo@gmail.com>2010-06-11 03:24:50 +0000
committerSol Jerome <sol.jerome@gmail.com>2010-06-11 08:17:40 -0500
commitc931eac86823787342f65386b950ef360f42ab32 (patch)
treec2260abb56547a69204b2d84b24e72e39110933d
parentdc900be695a958f1943217ceb704f5d015db6a40 (diff)
downloadbcfg2-c931eac86823787342f65386b950ef360f42ab32.tar.gz
bcfg2-c931eac86823787342f65386b950ef360f42ab32.tar.bz2
bcfg2-c931eac86823787342f65386b950ef360f42ab32.zip
Prevent bcfg2-server from hanging on exit when the Pseudo FileMonitor is used
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5923 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Core.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py
index f659fec4a..e08dd803d 100644
--- a/src/lib/Server/Core.py
+++ b/src/lib/Server/Core.py
@@ -119,7 +119,7 @@ class Core(Component):
if famfd:
select.select([famfd], [], [], 15)
else:
- while not self.fam.pending():
+ if not self.fam.pending():
time.sleep(15)
self.fam.handle_event_set(self.lock)
except: