diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2007-10-26 20:28:58 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2007-10-26 20:28:58 +0000 |
| commit | b9df45f3a508073dc30586934dcb17027bf7ff85 (patch) | |
| tree | 76719e3a2ba38ab3156d8c36d54519c941fc315c | |
| parent | 1a0717d7e8adeebf719f4418ed8c5888c3741cef (diff) | |
| download | bcfg2-b9df45f3a508073dc30586934dcb17027bf7ff85.tar.gz bcfg2-b9df45f3a508073dc30586934dcb17027bf7ff85.tar.bz2 bcfg2-b9df45f3a508073dc30586934dcb17027bf7ff85.zip | |
Handle fam/gamin overall failure better
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3873 ce84e21b-d406-0410-9b95-82705330c041
| -rwxr-xr-x | src/sbin/bcfg2-server | 8 |
1 files changed, 7 insertions, 1 deletions
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 |