Make ajaxterm play nicely with CherryPy

svn path=/package_branches/invirt-web/ajaxterm-rebased/; revision=2749

diff --git a/code/ajaxterm.py b/code/ajaxterm.py
index 2b4ff44..dd7e5b8 100644 (file)
--- a/code/ajaxterm.py
+++ b/code/ajaxterm.py
@@ -368,10 +368,10 @@ class SynchronizedMethod:
 
 class Multiplex:
        def __init__(self):
 
 class Multiplex:
        def __init__(self):

-               signal.signal(signal.SIGCHLD, signal.SIG_IGN)

                self.proc={}
                self.lock=threading.RLock()
                self.thread=threading.Thread(target=self.loop)
                self.proc={}
                self.lock=threading.RLock()
                self.thread=threading.Thread(target=self.loop)

+               self.thread.daemon=True

                self.alive=1
                # synchronize methods
                for name in ['create','fds','proc_read','proc_write','dump','die','run']:
                self.alive=1
                # synchronize methods
                for name in ['create','fds','proc_read','proc_write','dump','die','run']: