summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2008-09-09 04:20:38 +0000
committerNarayan Desai <desai@mcs.anl.gov>2008-09-09 04:20:38 +0000
commitdd36b243507feb8a76c8b7dc99779594a2848d23 (patch)
treec850b08dae326fe11a17afdcd5fa9b025f3fa9a2 /src/sbin
parent926c2d83ef9832a687b9c5276f9c06b453f75a11 (diff)
downloadbcfg2-dd36b243507feb8a76c8b7dc99779594a2848d23.tar.gz
bcfg2-dd36b243507feb8a76c8b7dc99779594a2848d23.tar.bz2
bcfg2-dd36b243507feb8a76c8b7dc99779594a2848d23.zip
Make file monitor selectable
Handle child processes more aggressively git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4908 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin')
-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 ba438a07d..ca1565101 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -35,7 +35,7 @@ class Bcfg2Serv(Bcfg2.Component.Component):
try:
self.Core = Core(setup['repo'], setup['plugins'], setup['structures'],
setup['generators'], setup['password'],
- setup['svn'], setup['encoding'])
+ setup['svn'], setup['encoding'], setup['filemonitor'])
except CoreInitError, msg:
logger.critical("Fatal error: %s" % (msg))
raise SystemExit, 1
@@ -86,6 +86,7 @@ class Bcfg2Serv(Bcfg2.Component.Component):
rsockinfo = []
famfd = self.Core.fam.fileno()
while self.socket not in rsockinfo:
+ self.clean_up_children()
if self.shut:
raise socket.error
try:
@@ -202,7 +203,9 @@ if __name__ == '__main__':
'plugins': Bcfg2.Options.SERVER_PLUGINS,
'structures': Bcfg2.Options.SERVER_STRUCTURES,
'generators': Bcfg2.Options.SERVER_GENERATORS,
- 'password': Bcfg2.Options.SERVER_PASSWORD})
+ 'password': Bcfg2.Options.SERVER_PASSWORD,
+ 'filemonitor': Bcfg2.Options.SERVER_FILEMONITOR,
+ })
OPTINFO.update({'key' : Bcfg2.Options.SERVER_KEY,
'location' : Bcfg2.Options.SERVER_LOCATION,
'passwd' : Bcfg2.Options.SERVER_PASSWORD,