[Erp5-report] r45921 guillaume.bottex - /slapos/trunk/util/slapos.tool.nosqltester/src/slap...

[nobody at svn.erp5.org]

Author: guillaume.bottex
Date: Sun Jun 19 19:04:55 2011
New Revision: 45921

URL: http://svn.erp5.org?rev=45921&view=rev
Log:
Fixes for file download.

Modified:
    slapos/trunk/util/slapos.tool.nosqltester/src/slapos/tool/nosqltester/__init__.py

Modified: slapos/trunk/util/slapos.tool.nosqltester/src/slapos/tool/nosqltester/__init__.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.nosqltester/src/slapos/tool/nosqltester/__init__.py?rev=45921&r1=45920&r2=45921&view=diff
==============================================================================
--- slapos/trunk/util/slapos.tool.nosqltester/src/slapos/tool/nosqltester/__init__.py [utf8] (original)
+++ slapos/trunk/util/slapos.tool.nosqltester/src/slapos/tool/nosqltester/__init__.py [utf8] Sun Jun 19 19:04:55 2011
@@ -31,6 +31,7 @@ from flask import Flask, request
 from threading import Lock
 # from zipfile import ZipFile
 from logging import Formatter
+from socket import gethostname
 
 import sys
 import os
@@ -147,13 +148,13 @@ class NoSQLTester(object):
       
       """
       try:
-        try:
+        if 'size' in request.args:
           size = int(request.args['size'])
-        except KeyError:
+        else:
           size = -1
 
         if os.path.exists(os.path.join(self.argument_namespace.report_directory,
-                                       report.rstrip(self.argument_namespace.compress_method))):
+                                       report.rstrip(self._filename_extension))):
           data = None
           f = open(os.path.join(self.argument_namespace.report_directory,
                                 report.rstrip(self._filename_extension)), "rb")
@@ -190,6 +191,8 @@ class NoSQLTester(object):
           
           if pid == 0:
             result = self.run_tester()
+            if result == 0:
+              self.send_result_availability_notification()
             os._exit(os.EX_OK)
           else:
             self.lock.acquire()
@@ -221,7 +224,7 @@ class NoSQLTester(object):
     
     """
     values = {}
-    values['filename'] = filename
+    values['filename'] = "%s-%d-%s" % (socket.gethostname(), os.getpid(), filename)
     values['url'] = "http://[%s]:%d/result/%s?size=%d" % (self.argument_namespace.tester_address,
                                                           self.argument_namespace.tester_port,
                                                           filename + self._filename_extension,
@@ -229,9 +232,6 @@ class NoSQLTester(object):
     values['compress_method'] = self.argument_namespace.compress_method
     values['partial'] = partial
     
-    if values['compress_method'] != None:
-      values['url'] += values['compress_method']
-    
     data = urllib.urlencode(values)
     try:
       f = urllib2.urlopen("http://[%s]:%d/report" % (self.argument_namespace.manager_address,
@@ -259,9 +259,6 @@ class NoSQLTester(object):
     if result == 127:
       raise ValueError, 'Command not found: %r' % command
 
-    if result == 0:
-      self.send_result_availability_notification(self.argument_namespace.report_filename)
-
     return result
 
 def main():