[Erp5-report] r45891 arnaud.fontaine - /slapos/trunk/util/slapos.tool.nosqltester/src/slapo...

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Wed Jun 15 08:29:31 2011
New Revision: 45891

URL: http://svn.erp5.org?rev=45891&view=rev
Log:
Allow to specify the 'size' of report file to send.

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=45891&r1=45890&r2=45891&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] Wed Jun 15 08:29:31 2011
@@ -55,13 +55,18 @@ class NoSQLTester(object):
     @app.route('/result/<report>')
     def download(report):
       try:
+        try:
+          size = request.args['size']
+        except KeyError:
+          size = -1
+
         if os.path.exists(os.path.join(self.params['report_path'], report.rstrip(self.params['compress_method']))):
           data = None
           f = open(os.path.join(self.params['report_path'], report.rstrip(self.params['compress_method'])), "rb")
           if self.params['compress_method'] == "":
-            data = f.read()
+            data = f.read(size)
           elif self.params['compress_method'] == ".bz2":
-            data = bz2.compress(f.read(), 9)
+            data = bz2.compress(f.read(size), 9)
           elif self.params['compress_method'] == ".zip":
             # Zip compress
             # z = ZipFile(os.path.join(os.getcwd(), self.params['report_filename']+compress_method), 'w')
@@ -102,12 +107,13 @@ class NoSQLTester(object):
 
     app.run(host=self.params['address'], port=self.params['port'], threaded=True)
 
-  def send_result_availability_notification(self, filename):
+  def send_result_availability_notification(self, filename, size=-1):
     values = {}
     values['filename'] = filename
-    values['url'] = "http://%s:%d/result/%s" % (self.params['address'],
-                                                self.params['port'],
-                                                filename)
+    values['url'] = "http://%s:%d/result/%s?size=%d" % (self.params['address'],
+                                                        self.params['port'],
+                                                        filename,
+                                                        size)
     values['compress_method'] = self.params['compress_method']
     
     if self.params['compress_method'] != None: