1.1 --- a/OpenSecurity/bin/opensecurityd.pyw	Mon May 12 18:00:05 2014 +0200
     1.2 +++ b/OpenSecurity/bin/opensecurityd.pyw	Tue May 13 12:55:50 2014 +0200
     1.3 @@ -45,6 +45,7 @@
     1.4  # local
     1.5  import __init__ as opensecurity
     1.6  from cygwin import Cygwin
     1.7 +from environment import Environment
     1.8  from opensecurity_util import logger
     1.9  
    1.10  
    1.11 @@ -118,7 +119,7 @@
    1.12          log_call(web.ctx.environ)
    1.13          global gvm_mgr
    1.14  
    1.15 -        trace_file_name = os.path.join(tempfile.gettempdir(), 'OpenSecurity_fetch_image.log')
    1.16 +        trace_file_name = os.path.join(Environment('OpenSecurity').log_path, 'OpenSecurity_fetch_image.log')
    1.17          trace_file = open(trace_file_name, 'w+')
    1.18  
    1.19          machine_folder = Cygwin.cygPath(gvm_mgr.getMachineFolder()) 
    1.20 @@ -128,6 +129,7 @@
    1.21          res = '{ "fetch_log": "' + trace_file_name.replace('\\', '\\\\') + '" }'
    1.22          return res
    1.23  
    1.24 +
    1.25  class os_init:
    1.26      """OpenSecurity '/init' handler
    1.27      
    1.28 @@ -138,7 +140,7 @@
    1.29          log_call(web.ctx.environ)
    1.30          global gvm_mgr
    1.31  
    1.32 -        trace_file_name = os.path.join(tempfile.gettempdir(), 'OpenSecurity_initial_import.log')
    1.33 +        trace_file_name = os.path.join(Environment('OpenSecurity').log_path, 'OpenSecurity_initial_import.log')
    1.34          trace_file = open(trace_file_name, 'w+')
    1.35  
    1.36          vm_image = Cygwin.cygPath(gvm_mgr.getMachineFolder()) + '/OsecVM.ova'
    1.37 @@ -185,6 +187,7 @@
    1.38          res += '"version": "' + opensecurity.__version__ + '" '
    1.39          res += ', "virtual box systemproperties": ' + str(gvm_mgr.systemProperties).replace("'", '"') 
    1.40          res += ', "current temporary folder": "' + tempfile.gettempdir().replace('\\', '\\\\') + '"'
    1.41 +        res += ', "current log folder": "' + Environment('OpenSecurity').log_path.replace('\\', '\\\\') + '"'
    1.42  
    1.43          try:
    1.44              res += ', "whoami": "' + Cygwin.bashExecute('whoami')[1].strip() + '"'