Merge lp:~ev/oops-repository/whoopsie-daisy into lp:oops-repository

[Evan]

[lp:~ev/oops-repository/whoopsie-daisy]

13. By Evan on 2012-01-10

Make OOPS_HOST an envar for consistency.

=== modified file 'oopsrepository/config.py'
--- oopsrepository/config.py	2011-02-26 09:30:53 +0000
+++ oopsrepository/config.py	2012-01-10 11:43:23 +0000
@@ -10,7 +10,8 @@
 
 def get_config():
     """Get a dict of the config variables controlling oopsrepository."""
-    result = dict(keyspace=os.environ.get('OOPS_KEYSPACE'))
+    result = dict(keyspace=os.environ.get('OOPS_KEYSPACE'),
+	              host=os.environ.get('OOPS_HOST'))
     if not result['keyspace']:
         raise Exception('No keyspace set - set via OOPS_KEYSPACE')
     return result

=== modified file 'oopsrepository/oopses.py'
--- oopsrepository/oopses.py	2011-04-03 11:14:12 +0000
+++ oopsrepository/oopses.py	2012-01-10 11:43:23 +0000
@@ -7,6 +7,7 @@
 """basic operations on oopses in the db."""
 
 import json
+import bson
 import time
 import uuid
 
@@ -19,7 +20,7 @@
 
 def prune(config):
     """Remove OOPSES that are over 30 days old."""
-    pool = pycassa.connect(config['keyspace'])
+    pool = pycassa.connect(config['keyspace'], config['host'])
     dayoops_cf = pycassa.ColumnFamily(pool, 'DayOOPS')
     oops_cf = pycassa.ColumnFamily(pool, 'OOPS')
     # Find days to prune
@@ -53,17 +54,11 @@
     map(batch.remove, days)
     batch.send()
 
-
 def insert(config, oopsid, oops_json):
     """Insert an OOPS into the system.
     
     :return: The day which the oops was filed under.
     """
-    pool = pycassa.connect(config['keyspace'])
-    dayoops_cf = pycassa.ColumnFamily(pool, 'DayOOPS')
-    oops_cf = pycassa.ColumnFamily(pool, 'OOPS')
-    day_key = time.strftime('%Y%m%d', time.gmtime())
-    now_uuid = uuid.uuid1()
     # make sure the oops report is a json dict, and break out each key to a
     # separate column. For now, rather than worrying about typed column values
     # we just coerce them all to strings.
@@ -72,6 +67,24 @@
     insert_dict = {}
     for key, value in oops_dict.items():
         insert_dict[key] = json.dumps(value)
+    return _insert(config, oopsid, insert_dict)
+
+def insert_bson(config, oopsid, oops_bson):
+    """Insert an OOPS into the system.
+    
+    :return: The day which the oops was filed under.
+    """
+    oops_dict = bson.BSON(oops_bson)
+    insert_dict = oops_dict.to_dict()
+    return _insert(config, oopsid, insert_dict)
+
+def _insert(config, oopsid, insert_dict):
+    pool = pycassa.connect(config['keyspace'], config['host'])
+    dayoops_cf = pycassa.ColumnFamily(pool, 'DayOOPS')
+    oops_cf = pycassa.ColumnFamily(pool, 'OOPS')
+    day_key = time.strftime('%Y%m%d', time.gmtime())
+    now_uuid = uuid.uuid1()
+
     oops_cf.insert(oopsid, insert_dict)
     dayoops_cf.insert(day_key, {now_uuid:oopsid})
     return day_key