[pypy-svn] r41695 - in pypy/build/buildtool: bin web web/test

[guido at codespeak.net]

Author: guido
Date: Fri Mar 30 15:05:02 2007
New Revision: 41695

Modified:
   pypy/build/buildtool/bin/webserver
   pypy/build/buildtool/web/app.py
   pypy/build/buildtool/web/test/test_app.py
Log:
Signal doesn't work with SshGateway (not executed in main thread), fixed bug
in tests (oops).


Modified: pypy/build/buildtool/bin/webserver
==============================================================================
--- pypy/build/buildtool/bin/webserver	(original)
+++ pypy/build/buildtool/bin/webserver	Fri Mar 30 15:05:02 2007
@@ -6,8 +6,11 @@
 
 if __name__ == '__main__':
     from buildtool.web.server import run_server
-    from buildtool.web.app import AppHandler
+    from buildtool.web.app import AppHandler, cleanup_shared
     print 'starting server at port (%r, %r)' % (config.webserver,
                                                 config.webport)
-    run_server((config.webserver, config.webport), AppHandler)
+    try:
+        run_server((config.webserver, config.webport), AppHandler)
+    finally:
+        cleanup_shared()
 

Modified: pypy/build/buildtool/web/app.py
==============================================================================
--- pypy/build/buildtool/web/app.py	(original)
+++ pypy/build/buildtool/web/app.py	Fri Mar 30 15:05:02 2007
@@ -4,7 +4,6 @@
 
 import py
 import time
-import signal
 import sys
 from buildtool import config
 from buildtool import execnetconference
@@ -510,13 +509,13 @@
     if ServerPage._shared['initialized']:
         ServerPage._shared['channel'].close()
         ServerPage._shared['gateway'].exit()
-    print 'closed server'
+    print 'exiting...'
     sys.exit(0)
 
-signal.signal(signal.SIGHUP, cleanup_shared)
-signal.signal(signal.SIGINT, cleanup_shared)
-
 if __name__ == '__main__':
     from buildtool.web.server import run_server
-    run_server(('', 8080), AppHandler)
+    try:
+        run_server(('', 8080), AppHandler)
+    finally:
+        cleanup_shared()
 

Modified: pypy/build/buildtool/web/test/test_app.py
==============================================================================
--- pypy/build/buildtool/web/test/test_app.py	(original)
+++ pypy/build/buildtool/web/test/test_app.py	Fri Mar 30 15:05:02 2007
@@ -75,7 +75,7 @@
 def teardown_module(mod):
     mod.server_channel.send('quit')
     mod.server_channel.close()
-    mod.server_gateway.exit()
+    mod.server_gw.exit()
     mod.gateway.exit()
 
 class TestIndexPage(object):