more gently termination of opensecurityd server
authorOliver Maurhart <oliver.maurhart@ait.ac.at>
Wed, 30 Apr 2014 12:10:34 +0200
changeset 1388e133512ab7a
parent 137 a135e468b623
child 139 76ac81b519cf
more gently termination of opensecurityd server
OpenSecurity/bin/opensecurityd.pyw
     1.1 --- a/OpenSecurity/bin/opensecurityd.pyw	Wed Apr 30 12:07:12 2014 +0200
     1.2 +++ b/OpenSecurity/bin/opensecurityd.pyw	Wed Apr 30 12:10:34 2014 +0200
     1.3 @@ -81,6 +81,10 @@
     1.4  # Global VMManager instance
     1.5  gvm_mgr = None
     1.6  
     1.7 +# server instance
     1.8 +server = None
     1.9 +
    1.10 +
    1.11  # ------------------------------------------------------------
    1.12  # code
    1.13  
    1.14 @@ -353,6 +357,8 @@
    1.15      
    1.16      def GET(self):
    1.17          log_call(web.ctx.environ)
    1.18 +        global server
    1.19 +        server.stop()
    1.20          global gvm_mgr
    1.21          gvm_mgr.cleanup()
    1.22          sys.exit(0)
    1.23 @@ -416,6 +422,7 @@
    1.24      
    1.25      # tweak sys.argv to control wep.py server start behavior
    1.26      sys.argv = [__file__, "8080"]
    1.27 +    global server
    1.28      server = web.application(opensecurity_urls, globals(), autoreload = False)
    1.29      server.run()
    1.30