saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #38248 from meaksh/salt-api-successfully-close-child-processes

Browse source 
Successfully exit of salt-api child processes when SIGTERM is received
This commit is contained in:
Mike Place 2016-12-15 02:16:27 -07:00 • committed by GitHub
commit fc9e1dff35
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/netapi/rest_cherrypy/app.py
View file

@ -424,7 +424,9 @@ import itertools
import functools
import logging
import json
import os
import StringIO
import signal
import tarfile
import time
from multiprocessing import Process, Pipe
@ -2182,6 +2184,12 @@ class WebsocketEndpoint(object):
listen=True)
stream = event.iter_events(full=True, auto_reconnect=True)
SaltInfo = event_processor.SaltInfo(handler)
def signal_handler(signal, frame):
os._exit(0)
signal.signal(signal.SIGTERM, signal_handler)
while True:
data = next(stream)
if data: