messages count
diff --git a/wally/suits/omgbench/__init__.py b/wally/suits/omgbench/__init__.py
index 2e09c11..d3f82a2 100644
--- a/wally/suits/omgbench/__init__.py
+++ b/wally/suits/omgbench/__init__.py
@@ -18,12 +18,12 @@
duration_vals = []
count = 0
for res in data[0]:
- msgs, times, success, duration = res.raw_result.strip().split('\n')
- count += int(msgs) * int(times)
+ msgs, success, duration = res.raw_result.strip().split('\n')
+ count += msgs
success_vals.append(float(success))
duration_vals.append(float(duration))
- totalt = sum(duration_vals)
+ totalt = max(duration_vals)
totalms = int(count / totalt)
sucesst = int(sum(success_vals) / len(success_vals))
tab = texttable.Texttable(max_width=120)
diff --git a/wally/suits/omgbench/run.sh b/wally/suits/omgbench/run.sh
index 8adb4c1..ebf093a 100755
--- a/wally/suits/omgbench/run.sh
+++ b/wally/suits/omgbench/run.sh
@@ -32,12 +32,11 @@
cd omgbenchmark/rally_plugin
sed -i -e "s+rabbit:\/\/guest:guest@localhost\/+$URL+g" deployment.json
-sed -i -e "s,times\": 100,times\": $TIMES,g" task.json
+sed -i -e "s,timeout\": 60,timeouts\": $TIMES,g" task_timeout.json
rally --plugin-paths . deployment create --file=deployment.json --name=test &> /dev/null
rally --plugin-paths . task start task.json &> ~/omg.log
-cat ~/omg.log | grep -m 1 "num_messages" | grep -o '[0-9,.]\+'
-cat ~/omg.log | grep -m 1 "times" | grep -o '[0-9,.]\+'
+cat ~/omg.log | grep "Messages count" | grep -o '[0-9,.]\+'
cat ~/omg.log | grep "total" | grep -o '[0-9,.]\+%' | grep -o '[0-9,.]\+'
cat ~/omg.log | grep "Load duration" | grep -o '[0-9,.]\+'