mark/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

do not need to use terminate()/SIGTERM

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-16 12:04:04 +02:00
commit dbdf036787
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bin/cdist
View file

@ -150,9 +150,12 @@ def configinstall(args, mode):
except KeyboardInterrupt: except KeyboardInterrupt:
if args.parallel: if args.parallel:
for p in process.keys(): for p in process.keys():
pid = process[p].pid.__str__() # NOT needed: KeyBoardInterrupet (aka SIGINT)
log.warn("Terminating deploy " + p + " (" + pid + ")") # is forwarded to processes spawned by multiprocess!
process[p].terminate() # pid = process[p].pid.__str__()
#log.warn("Terminating deploy " + p + " (" + pid + ")")
# process[p].terminate()
pass
sys.exit(0) sys.exit(0)
@ -182,6 +185,7 @@ def configinstall_onehost(host, args, mode, parallel):
if not parallel: if not parallel:
raise raise
else: else:
# Catch here, above does not need to know about our errors
return False return False
return True return True