fix version number in torperf export data format

closes #34
robgjansen · May 19, 2017 · 3b40d4993fd657e3e8fe063507d9f8a7cdcdec3a · 3b40d49
1 parent 8b1abb1
commit 3b40d4993fd657e3e8fe063507d9f8a7cdcdec3a
Showing with 4 additions and 4 deletions.

+2 −2 onionperf/analysis.py

+1 −1 onionperf/measurement.py

+1 −1 onionperf/onionperf
diff --git a/onionperf/analysis.py b/onionperf/analysis.py
@@ -138,7 +138,7 @@ def load(cls, filename="onionperf.analysis.json.xz", input_prefix=os.getcwd(), v
             analysis_instance.json_db = db
             return analysis_instance
 
-    def export_torperf_version_1_0(self, output_prefix=os.getcwd(), do_compress=False):
+    def export_torperf_version_1_1(self, output_prefix=os.getcwd(), do_compress=False):
         # export file in `@type torperf 1.0` format: https://collector.torproject.org/#type-torperf
         if not os.path.exists(output_prefix):
             os.makedirs(output_prefix)
@@ -260,7 +260,7 @@ def ts_to_str(ts): return"{0:.02f}".format(ts)
                                 d['USED_AT'] = stream_db['unix_ts_end']
                                 d['USED_BY'] = int(stream_db['stream_id'])
 
-                        output.write("@type torperf 1.0\r\n")
+                        output.write("@type torperf 1.1\r\n")
                         output_str = ' '.join("{0}={1}".format(k, d[k]) for k in sorted(d.keys()) if d[k] is not None).strip()
                         output.write("{0}\r\n".format(output_str))
                     except KeyError, e:

diff --git a/onionperf/measurement.py b/onionperf/measurement.py
@@ -150,7 +150,7 @@ def logrotate_thread_task(writables, tgen_writable, torctl_writable, docroot, ni
 
                     # save the results in onionperf and torperf format in the twistd docroot
                     anal.save(output_prefix=docroot, do_compress=True)
-                    anal.export_torperf_version_1_0(output_prefix=docroot, do_compress=False)
+                    anal.export_torperf_version_1_1(output_prefix=docroot, do_compress=False)
 
                     # update the xml index in docroot
                     generate_docroot_index(docroot)

diff --git a/onionperf/onionperf b/onionperf/onionperf
@@ -401,7 +401,7 @@ def analyze(args):
     analysis.analyze(args.do_simple, date_filter=args.date_filter)
     analysis.save(output_prefix=args.prefix)
     if args.save_torperf:
-        analysis.export_torperf_version_1_0(output_prefix=args.prefix, do_compress=False)
+        analysis.export_torperf_version_1_1(output_prefix=args.prefix, do_compress=False)
 
 def visualize(args):
     from onionperf.visualization import TGenVisualization, TorVisualization