1.1 --- a/OpenSecurity/bin/opensecurityd.pyw Tue Mar 04 16:54:51 2014 +0100
1.2 +++ b/OpenSecurity/bin/opensecurityd.pyw Wed Mar 05 10:15:34 2014 +0100
1.3 @@ -107,7 +107,7 @@
1.4 global gvm_mgr
1.5 res = "'os_server': { "
1.6 res += "'version': '" + __version__ + "', "
1.7 - res += "'machine_folder': '" + gvm_mgr.getDefaultMachineFolder() + "' "
1.8 + res += "'machine_folder': '" + gvm_mgr.machineFolder + "' "
1.9 res += "}"
1.10 return res
1.11
1.12 @@ -230,6 +230,7 @@
1.13 def GET(self):
1.14 log_call(web.ctx.environ)
1.15 global gvm_mgr
1.16 + gvm_mgr.cleanup()
1.17 sys.exit(0)
1.18 return None
1.19
1.20 @@ -295,6 +296,16 @@
1.21 logger.debug('Stopped OpenSecurity REST server')
1.22
1.23
1.24 +def stop():
1.25 + """stop the opensecuirityd"""
1.26 +
1.27 + # calling sys.exit() raises a SystemExit exception
1.28 + # of the WSGI Server to let it wind down
1.29 + # gravefully
1.30 + sys.exit(0)
1.31 +
1.32 +
1.33 +
1.34 # start
1.35 if __name__ == "__main__":
1.36 main()