From b9df45f3a508073dc30586934dcb17027bf7ff85 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Fri, 26 Oct 2007 20:28:58 +0000 Subject: Handle fam/gamin overall failure better git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3873 ce84e21b-d406-0410-9b95-82705330c041 --- src/sbin/bcfg2-server | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/sbin/bcfg2-server') diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 431732896..1ead18718 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -96,11 +96,17 @@ class Bcfg2Serv(Bcfg2.Component.Component): self.register_function(getattr(self.Core.plugins[plugin.__name__], method), "%s.%s" % (plugin.__name__, method)) famfd = self.Core.fam.fileno() + events = False while True: try: rsockinfo = select.select([famfd], [], [], 15)[0] if not rsockinfo: - break + if events: + break + else: + logger.error("Hit event timeout without getting any events; GAMIN/FAM problem?") + continue + events = True self.Core.Service() except socket.error: continue -- cgit v1.2.3-1-g7c22