Merge lp:~soren/surveilr/db-connection into lp:surveilr

[Soren Hansen]

Make the API server actually connect to Riak

=== modified file 'surveilr/api/server.py'
--- surveilr/api/server.py	2011-11-30 09:32:31 +0000
+++ surveilr/api/server.py	2011-11-30 09:59:24 +0000
@@ -35,6 +35,7 @@
 from webob.dec import wsgify
 from webob.exc import HTTPNotFound
 
+from surveilr import config
 from surveilr import messaging
 from surveilr import models
 from surveilr import utils
@@ -184,6 +185,10 @@
 
 
 def main():
+    riak_host = config.get_str('riak', 'host')
+    riak_port = config.get_int('riak', 'port')
+
+    riakalchemy.connect(host=riak_host, port=riak_port)
     socket = eventlet.listen(('', 9877))
     eventlet.wsgi.server(socket, application)
 

=== modified file 'surveilr/defaults.cfg'
--- surveilr/defaults.cfg	2011-11-29 23:41:46 +0000
+++ surveilr/defaults.cfg	2011-11-30 09:59:24 +0000
@@ -1,7 +1,11 @@
 # This is where we stick defaults for various things
 
 [sms]
-username = 
-password = 
-api_id = 
-sender = 
+username =
+password =
+api_id =
+sender =
+
+[riak]
+host = 127.0.0.1
+port = 8098

=== modified file 'surveilr/tests/test_api_server.py'
--- surveilr/tests/test_api_server.py	2011-11-30 09:27:57 +0000
+++ surveilr/tests/test_api_server.py	2011-11-30 09:59:24 +0000
@@ -126,13 +126,14 @@
         resp = application(req)
         self.assertEquals(resp.status_int, 404)
 
-    def test_main(self):
-        with mock.patch('surveilr.api.server.eventlet',
-                        spec=['listen', 'wsgi']) as eventlet:
-            socket_sentinel = mock.sentinel.return_value
-            eventlet.listen.return_value = socket_sentinel
-            server.main()
+    @mock.patch('surveilr.api.server.eventlet', spec=['listen', 'wsgi'])
+    @mock.patch('surveilr.api.server.riakalchemy', spec=['connect'])
+    def test_main(self, riakalchemy, eventlet):
+        socket_sentinel = mock.sentinel.return_value
+        eventlet.listen.return_value = socket_sentinel
+        server.main()
 
-            eventlet.listen.assert_called_with(('', 9877))
-            eventlet.wsgi.server.assert_called_with(socket_sentinel,
-                                                    application)
+        riakalchemy.connect.assert_called_with(host='127.0.0.1', port=8098)
+        eventlet.listen.assert_called_with(('', 9877))
+        eventlet.wsgi.server.assert_called_with(socket_sentinel,
+                                                application)