summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2005-10-18 04:55:48 +0000
committerNarayan Desai <desai@mcs.anl.gov>2005-10-18 04:55:48 +0000
commit953d77f8ffb3b10d70d3819691c6f094197b97ea (patch)
tree760841e6a62c95d359a167a9d6a76a3ac5b568d5 /src
parent34493fcdbc58000fe80d40c9a3910e80ecb9ecc4 (diff)
downloadbcfg2-953d77f8ffb3b10d70d3819691c6f094197b97ea.tar.gz
bcfg2-953d77f8ffb3b10d70d3819691c6f094197b97ea.tar.bz2
bcfg2-953d77f8ffb3b10d70d3819691c6f094197b97ea.zip
update to new fam API
(Logical change 1.337) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1383 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/sbin/Bcfg2ServerX7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/sbin/Bcfg2ServerX b/src/sbin/Bcfg2ServerX
index 5d9ae7630..f67a8babd 100644
--- a/src/sbin/Bcfg2ServerX
+++ b/src/sbin/Bcfg2ServerX
@@ -138,16 +138,15 @@ class Bcfg2XMLRPCServer(SSL.SSLServer,
def get_request(self):
'''We need to do work between requests, so we select with timeout instead of blocking in accept'''
rsockinfo = []
- famfd = self.Core.fam.fm.fileno()
+ famfd = self.Core.fam.fileno()
while self.socket not in rsockinfo:
try:
rsockinfo = select([self.socket, famfd], [], [])[0]
except selecterror:
continue
if famfd in rsockinfo:
- print "starting fs sync...",
- while self.Core.fam.fm.pending():
- self.Core.fam.HandleEvent()
+ print "starting fs sync...",
+ self.Core.fam.Service()
print "done"
if self.socket in rsockinfo:
return self.socket.accept()