summaryrefslogtreecommitdiffstats
path: root/src/sbin/bcfg2-server
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-03-09 18:18:59 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-03-09 18:18:59 +0000
commitf827612576845b27548a3b7a1b14de01a27039d4 (patch)
treedcf08b7d422918e6f760f4bd45db997c8350289a /src/sbin/bcfg2-server
parente271e17a4a12984381ff15a219d7ebd832c77200 (diff)
downloadbcfg2-f827612576845b27548a3b7a1b14de01a27039d4.tar.gz
bcfg2-f827612576845b27548a3b7a1b14de01a27039d4.tar.bz2
bcfg2-f827612576845b27548a3b7a1b14de01a27039d4.zip
improve startup even handling for bcfg2-info and bcfg2-server
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5115 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin/bcfg2-server')
-rwxr-xr-xsrc/sbin/bcfg2-server7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 791f6a1bd..c80655528 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -9,7 +9,7 @@ from Bcfg2.Server.Core import Core, CoreInitError
from xmlrpclib import Fault
from lxml.etree import XML, Element, tostring
-import logging, select, socket, sys
+import logging, select, socket, sys, time
import Bcfg2.Logger, Bcfg2.Options, Bcfg2.Component, Bcfg2.Daemon
logger = logging.getLogger('bcfg2-server')
@@ -55,7 +55,10 @@ class Bcfg2Serv(Bcfg2.Component.Component):
logger.error("Hit event timeout without getting any events; GAMIN/FAM problem?")
continue
events = True
- self.Core.Service()
+ i = 0
+ while self.Core.fam.Service() or i < 10:
+ i += 1
+ time.sleep(0.1)
except socket.error:
continue
try: