Merge lp:~soren/surveilr/pastify into lp:surveilr

[Soren Hansen]

Use PasteDeploy for service configuration

=== modified file 'README.md'
--- README.md	2011-11-30 22:02:41 +0000
+++ README.md	2011-12-18 14:29:23 +0000
@@ -4,22 +4,28 @@
 
 ## Riak setup ##
 
-    wget http://downloads.basho.com/riak/CURRENT/riak_1.0.2-1_ubuntu_11_amd64.deb
-	sudo dpkg -i riak_1.0.2-1_ubuntu_11_amd64.deb
+>     wget http://downloads.basho.com/riak/CURRENT/riak_1.0.2-1_ubuntu_11_amd64.deb
+>     sudo dpkg -i riak_1.0.2-1_ubuntu_11_amd64.deb
 
 You need to make a few changes to Riak's app.config.
 
-    sudo sed -e '/^ {riak_kv/ a {delete_mode, immediate},' \
-             -e 's/storage_backend, riak_kv_bitcask_backend/storage_backend, riak_kv_eleveldb_backend/' \
-             -e '/^ {riak_search/,+2 s/enabled, false/enabled, true/' -i.bak /etc/riak/app.config
+>     sudo sed -e '/^ {riak_kv/ a {delete_mode, immediate},' \
+>              -e 's/storage_backend, riak_kv_bitcask_backend/storage_backend, riak_kv_eleveldb_backend/' \
+>              -e '/^ {riak_search/,+2 s/enabled, false/enabled, true/' -i.bak /etc/riak/app.config
 
 Now we're ready to start Riak:
 
-    sudo /etc/init.d/riak start
+>     sudo /etc/init.d/riak start
 
 ## Other dependencies ##
 
 `tools/setup_virtualenv.sh` will pull in all the necessary dependencies and should let you run the test suite:
 
-    tools/setup_virtualenv.sh
-	.venv/bin/python setup.py nosetests
+>     tools/setup_virtualenv.sh
+>     .venv/bin/python setup.py nosetests
+
+## Running Surveilr ##
+
+You can start Surveilr this easily:
+
+>     paster serve surveilr/defaults.cfg

=== modified file 'setup.py'
--- setup.py	2011-11-29 23:14:20 +0000
+++ setup.py	2011-12-18 14:29:23 +0000
@@ -20,6 +20,19 @@
 #
 from setuptools import setup
 
+def get_install_requires():
+    install_requires = []
+    with open('tools/pip-requirements.txt', 'r') as fp:
+        for l in fp:
+            l = l.strip()
+            if l.startswith('#'):
+                continue
+            elif l.startswith('-e'):
+                install_requires.append(l[l.index('#egg=')+5:])
+            else:
+                install_requires.append(l)
+    return install_requires
+
 setup(
     name='surveilr',
     version='0.1a1',
@@ -29,7 +42,7 @@
     author_email='[e-mail]',
     url='http://surveilr.org/',
     packages=['surveilr'],
-    install_requires=['riakalchemy'],
+    install_requires=get_install_requires(),
     test_suite='nose.collector',
     install_package_data=True,
     classifiers=[

=== modified file 'surveilr/api/server.py'
--- surveilr/api/server.py	2011-12-12 10:25:03 +0000
+++ surveilr/api/server.py	2011-12-18 14:29:23 +0000
@@ -182,6 +182,9 @@
                  controller='NotificationController',
                  path_prefix='/users/{user_id}')
 
+    def __init__(self, global_config):
+        pass
+
     @wsgify
     def __call__(self, req):
         """Where it all happens
@@ -202,17 +205,20 @@
 
         return getattr(controller, method)(req, **kwargs)
 
-application = SurveilrApplication()
-
+def server_factory(global_conf, host, port):
+    port = int(port)
+    def serve(app):
+        socket = eventlet.listen((host, port))
+        eventlet.wsgi.server(socket, app)
+    return serve
 
 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)
 
+    server_factory({}, '', 9877)(SurveilrApplication({}))
 
 if __name__ == '__main__':  # pragma: nocover
     main()

=== modified file 'surveilr/defaults.cfg'
--- surveilr/defaults.cfg	2011-11-30 09:57:31 +0000
+++ surveilr/defaults.cfg	2011-12-18 14:29:23 +0000
@@ -9,3 +9,15 @@
 [riak]
 host = 127.0.0.1
 port = 8098
+
+[server:main]
+paste.server_factory = surveilr.api.server:server_factory
+host = 0.0.0.0
+port = 8977
+
+[composite:main]
+use = egg:Paste#urlmap
+/surveilr = core
+
+[app:core]
+paste.app_factory = surveilr.api.server:SurveilrApplication

=== modified file 'surveilr/tests/test_api_server.py'
--- surveilr/tests/test_api_server.py	2011-12-12 10:25:03 +0000
+++ surveilr/tests/test_api_server.py	2011-12-18 14:29:23 +0000
@@ -28,13 +28,14 @@
 from surveilr import models
 from surveilr import utils
 from surveilr.api import server
-from surveilr.api.server import application
+from surveilr.api.server import SurveilrApplication
 
 
 class APIServerTests(unittest.TestCase):
     def setUp(self):
         import riakalchemy
         riakalchemy.connect()
+        self.application = SurveilrApplication({})
 
     def test_create_retrieve_user(self):
         """Create, retrieve, delete, attempt to retrieve again"""
@@ -42,13 +43,13 @@
                             method='POST',
                             POST=json.dumps({'messaging_driver': 'fake',
                                              'messaging_address': 'foo'}))
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
         service_id = json.loads(resp.body)['id']
 
         req = Request.blank('/users/%s' % service_id)
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
         user = json.loads(resp.body)
@@ -56,18 +57,18 @@
         self.assertEquals(user['messaging_address'], 'foo')
 
         req = Request.blank('/users/%s' % service_id, method='DELETE')
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
         req = Request.blank('/users/%s' % service_id)
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 404)
 
     def test_send_notification(self):
         req = Request.blank('/users',
                             method='POST',
                             POST=json.dumps({}))
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
         user_id = json.loads(resp.body)['id']
@@ -77,7 +78,7 @@
                                          'timestamp': 13217362355575,
                                          'metrics': {'duration': 85000,
                                                      'response_size': 12435}}))
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
     def test_create_retrieve_service(self):
@@ -85,21 +86,21 @@
         req = Request.blank('/services',
                             method='POST',
                             POST=json.dumps({'name': 'this_or_the_other'}))
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
         service_id = json.loads(resp.body)['id']
 
         req = Request.blank('/services/%s' % service_id)
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
         req = Request.blank('/services/%s' % service_id, method='DELETE')
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
         req = Request.blank('/services/%s' % service_id)
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 404)
 
     def test_add_remove_plugin_to_service(self):
@@ -107,21 +108,21 @@
         req = Request.blank('/services',
                             method='POST',
                             POST=json.dumps({'name': 'this_or_the_other'}))
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
         service_id = json.loads(resp.body)['id']
 
         def get_plugins(service_id):
             req = Request.blank('/services/%s' % service_id)
-            resp = application(req)
+            resp = self.application(req)
             self.assertEquals(resp.status_int, 200)
             print 'body', resp.body
             return json.loads(resp.body)['plugins']
 
         req = Request.blank('/services/%s' % service_id, method="PUT",
                             POST=json.dumps({'plugins': [url]}))
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
         plugins = get_plugins(service_id)
@@ -129,7 +130,7 @@
 
         req = Request.blank('/services/%s' % service_id, method="PUT",
                             POST=json.dumps({'plugins': []}))
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
         plugins = get_plugins(service_id)
@@ -140,7 +141,7 @@
         req = Request.blank('/services',
                             method='POST',
                             POST='{"name": "this_or_the_other"}')
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
         service_id = json.loads(resp.body)['id']
@@ -151,7 +152,7 @@
                                          'metrics': {'duration': 85000,
                                                      'response_size': 12435}}))
         with mock.patch('surveilr.api.server.eventlet') as eventlet:
-            resp = application(req)
+            resp = self.application(req)
 
             self.assertEquals(eventlet.spawn_n.call_args[0][0],
                               utils.enhance_data_point)
@@ -161,11 +162,11 @@
         self.assertEquals(resp.status_int, 200)
 
         req = Request.blank('/services/%s/metrics' % service_id)
-        resp = application(req)
+        resp = self.application(req)
 
     def test_invalid_url(self):
         req = Request.blank('/stuff')
-        resp = application(req)
+        resp = self.application(req)
         self.assertEquals(resp.status_int, 404)
 
     @mock.patch('surveilr.api.server.eventlet', spec=['listen', 'wsgi'])
@@ -177,5 +178,6 @@
 
         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)
+        self.assertEquals(eventlet.wsgi.server.call_args[0][0], socket_sentinel)
+        self.assertEquals(type(eventlet.wsgi.server.call_args[0][1]),
+                          type(self.application))

=== modified file 'tools/pip-requirements.txt'
--- tools/pip-requirements.txt	2011-12-12 10:50:37 +0000
+++ tools/pip-requirements.txt	2011-12-18 14:29:23 +0000
@@ -9,3 +9,6 @@
 httplib2
 yanc
 nosexcover
+pastedeploy
+paste
+PasteScript