From 54a1f5fb0ea7e3bf0cd6034870777087d0c1ba13 Mon Sep 17 00:00:00 2001
From: Thomas Maddox <thomas.maddox@RACKSPACE.com>
Date: Wed, 22 May 2013 10:40:09 -0500
Subject: [PATCH] moved ack to after save of raw

---
 stacktach/views.py | 3 ---
 worker/worker.py   | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/stacktach/views.py b/stacktach/views.py
index a61eacf..a1a1a6b 100644
--- a/stacktach/views.py
+++ b/stacktach/views.py
@@ -364,9 +364,6 @@ def process_raw_data(deployment, args, json_args):
         values['json'] = json_args
         record = STACKDB.create_rawdata(**values)
         STACKDB.save(record)
-
-        aggregate_lifecycle(record)
-        aggregate_usage(record, body)
     return record
 
 
diff --git a/worker/worker.py b/worker/worker.py
index f62626f..18dfdb3 100644
--- a/worker/worker.py
+++ b/worker/worker.py
@@ -87,11 +87,15 @@ class NovaConsumer(kombu.mixins.ConsumerMixin):
         args = (routing_key, json.loads(body))
         asJson = json.dumps(args)
 
+        # save raw and ack the message
         raw = views.process_raw_data(self.deployment, args, asJson)
         if raw:
             self.processed += 1
             message.ack()
 
+        views.aggregate_lifecycle(raw)
+        views.aggregate_usage(raw, args[1])
+
         self._check_memory()
 
     def _check_memory(self):