     1.1 --- a/OpenSecurity/bin/opensecurityd.pyw	Wed Apr 02 09:47:38 2014 +0200
     1.2 +++ b/OpenSecurity/bin/opensecurityd.pyw	Wed Apr 02 10:27:38 2014 +0200
     1.3 @@ -124,17 +124,8 @@
     1.4          download_initial_image_script = '/OpenSecurity/bin/download_initial_image.sh \'' + machine_folder + '\''
     1.5          Cygwin.bashExecute(download_initial_image_script, wait_return = False, stdout = trace_file, stderr = trace_file) 
     1.6  
     1.7 -        page = """
     1.8 -        <html>
     1.9 -        <head></head>
    1.10 -        <body>
    1.11 -        Fetch OpenSecurity image log ({0}):<br/>
    1.12 -        <iframe src="file://{0}" width="100%" height="100%"></iframe>
    1.13 -        </body>
    1.14 -        </head>
    1.15 -        """
    1.16 -        return page.format(trace_file_name)
    1.17 -
    1.18 +        res = '{ "fetch.log": " ' + trace_file_name.replace('\\', '\\\\') + '" }'
    1.19 +        return res
    1.20  
    1.21  class os_init:
    1.22      """OpenSecurity '/init' handler
    1.23 @@ -153,16 +144,8 @@
    1.24          initial_import_script = '/OpenSecurity/bin/initial_vm.sh \'' + vm_image + '\''
    1.25          Cygwin.bashExecute(initial_import_script, wait_return = False, stdout = trace_file, stderr = trace_file) 
    1.26  
    1.27 -        page = """
    1.28 -        <html>
    1.29 -        <head></head>
    1.30 -        <body>
    1.31 -        Import initial OpenSecurity image log ({0}):<br/>
    1.32 -        <iframe src="file://{0}" width="100%" height="100%"></iframe>
    1.33 -        </body>
    1.34 -        </head>
    1.35 -        """
    1.36 -        return page.format(trace_file_name)
    1.37 +        res = '{ "init.log": " ' + trace_file_name.replace('\\', '\\\\') + '" }'
    1.38 +        return res
    1.39  
    1.40  
    1.41  class os_initial_image:
changeset 115	56a79fe30085
parent 112	9cd4654c040b
child 116	eb2c1260134e