gaschz/ansible-qubes
1
0
Fork 0
mirror of https://github.com/Rudd-O/ansible-qubes.git synced 2025-03-01 14:22:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

use thread- and queue-based signal handling

Browse Source
This commit is contained in:
Manuel Amador (Rudd-O) 2015-10-20 18:38:43 +00:00
parent 34be9f2b98
commit f480d4a87b
1 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
bin/bombshell-client
View File

@ -91,16 +91,30 @@ def recv_confirmation(chan):
return r, errmsg return r, errmsg
class SignalSender(object): class SignalSender(threading.Thread):
def __init__(self, signals, sigqueue):
def __init__(self, sigqueue): """Handles signals by pushing them into a file-like object."""
"""Handles signals by queueing them into a file-like object.""" threading.Thread.__init__(self)
self.setDaemon(True)
self.queue = Queue.Queue()
self.sigqueue = sigqueue self.sigqueue = sigqueue
for sig in signals:
signal.signal(sig, self.copy)
def copy(self, signum, frame): def copy(self, signum, frame):
assert signum > 0 self.queue.put(signum)
self.sigqueue.write(struct.pack("!H", signum)) logging.debug("Signal %s pushed to queue", signum)
self.sigqueue.flush()
def run(self):
while True:
signum = self.queue.get()
logging.debug("Dequeued signal %s", signum)
if signum is None:
break
assert signum > 0
self.sigqueue.write(struct.pack("!H", signum))
self.sigqueue.flush()
logging.debug("Wrote signal %s to remote end", signum)
class Signaler(threading.Thread): class Signaler(threading.Thread):
@ -216,23 +230,6 @@ class DataDemultiplexer(threading.Thread):
logging.debug("End of data demultiplexer") logging.debug("End of data demultiplexer")
def setup_signal_handler(sigqueue):
"""Sets process up for signal handling.
Only to be invoked from the master main."""
for sig in (
signal.SIGINT,
signal.SIGALRM,
signal.SIGTERM,
signal.SIGUSR1,
signal.SIGUSR2,
signal.SIGTSTP,
signal.SIGCONT,
):
copier = SignalSender(sigqueue)
signal.signal(sig, copier.copy)
def main_master(): def main_master():
global debug_enabled global debug_enabled
args = sys.argv[1:] args = sys.argv[1:]
@ -274,8 +271,19 @@ def main_master():
logging.error("remote: %s", errmsg) logging.error("remote: %s", errmsg)
return confirmation return confirmation
handled_signals = (
signal.SIGINT,
signal.SIGABRT,
signal.SIGALRM,
signal.SIGTERM,
signal.SIGUSR1,
signal.SIGUSR2,
signal.SIGTSTP,
signal.SIGCONT,
)
read_signals, write_signals = pairofpipes() read_signals, write_signals = pairofpipes()
setup_signal_handler(write_signals) signaler = SignalSender(handled_signals, write_signals)
signaler.start()
muxer = DataMultiplexer([sys.stdin, read_signals], p.stdin) muxer = DataMultiplexer([sys.stdin, read_signals], p.stdin)
muxer.start() muxer.start()