From e17f24ba5e570da0bc4003743a164601df8a8512 Mon Sep 17 00:00:00 2001 From: Isaac Gonzalez Date: Fri, 25 May 2012 15:58:57 -0400 Subject: [PATCH 1/2] fix directory structure to match README add std.reqs; change name of Mongrel2 config file --- bin/api_server.py | 37 +++++++++++++++++++++++++++++ bin/web_server.py | 59 +++++++++++++++++++++++++++++++++++++++++++++++ etc/m2.conf | 58 ++++++++++++++++++++++++++++++++++++++++++++++ etc/std.reqs | 5 ++++ 4 files changed, 159 insertions(+) create mode 100755 bin/api_server.py create mode 100755 bin/web_server.py create mode 100644 etc/m2.conf create mode 100644 etc/std.reqs diff --git a/bin/api_server.py b/bin/api_server.py new file mode 100755 index 0000000..2ab47f7 --- /dev/null +++ b/bin/api_server.py @@ -0,0 +1,37 @@ +#!/usr/bin/env python + + +from brubeck.request_handling import Brubeck +from brubeck.connections import Mongrel2Connection + +from readify.handlers import APIListDisplayHandler +from readify.queries import init_db_conn + +import logging + + +### +### Configuration +### + +# Instantiate database connection +db_conn = init_db_conn() + +# Routing config +handler_tuples = [ + (r'^/', APIListDisplayHandler), +] + +# Application config +config = { + 'msg_conn': Mongrel2Connection('tcp://127.0.0.1:9999', 'tcp://127.0.0.1:9998'), + 'handler_tuples': handler_tuples, + 'db_conn': db_conn, + 'cookie_secret': 'OMGSOOOOOSECRET', + 'log_level': logging.DEBUG, +} + + +# Instantiate app instance +app = Brubeck(**config) +app.run() diff --git a/bin/web_server.py b/bin/web_server.py new file mode 100755 index 0000000..2603b39 --- /dev/null +++ b/bin/web_server.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python + + +from brubeck.request_handling import Brubeck +from brubeck.connections import Mongrel2Connection +from brubeck.templating import load_jinja2_env + +from readify.handlers import (AccountLoginHandler, + AccountCreateHandler, + AccountLogoutHandler, + DashboardDisplayHandler, + LikedDisplayHandler, + ArchivedDisplayHandler, + ItemAddHandler, + ItemEditHandler, + SettingsHandler, + ProfilesHandler) + +from readify.queries import init_db_conn + +import logging + + +### +### Configuration +### + +# Instantiate database connection +db_conn = init_db_conn() + +# Routing config +handler_tuples = [ + (r'^/login', AccountLoginHandler), + (r'^/create', AccountCreateHandler), + (r'^/logout', AccountLogoutHandler), + (r'^/add_item', ItemAddHandler), + (r'^/edit_item/(?P\w+)', ItemEditHandler), + (r'^/settings', SettingsHandler), + (r'^/archived', ArchivedDisplayHandler), + (r'^/liked', LikedDisplayHandler), + (r'^/(?P\w+)', ProfilesHandler), + (r'^/$', DashboardDisplayHandler), +] + +# Application config +config = { + 'msg_conn': Mongrel2Connection('tcp://127.0.0.1:9997', 'tcp://127.0.0.1:9996'), + 'handler_tuples': handler_tuples, + 'template_loader': load_jinja2_env('./templates'), + 'db_conn': db_conn, + 'login_url': '/login', + 'cookie_secret': 'OMGSOOOOOSECRET', + 'log_level': logging.DEBUG, +} + + +# Instantiate app instance +app = Brubeck(**config) +app.run() diff --git a/etc/m2.conf b/etc/m2.conf new file mode 100644 index 0000000..de52991 --- /dev/null +++ b/etc/m2.conf @@ -0,0 +1,58 @@ +### +### API Handler +### + +api_handler = Handler( + send_spec='tcp://127.0.0.1:9999', + send_ident='34f9ceee-cd52-4b7f-b197-88bf2f0ec378', + recv_spec='tcp://127.0.0.1:9998', + recv_ident='') + +api_host = Host( + name="api.app", + routes={ + '/': api_handler + }) + + +### +### Web Handler +### + +web_handler = Handler( + send_spec='tcp://127.0.0.1:9997', + send_ident='34f9ceee-cd52-4b7f-b197-88bf2f0ec379', + recv_spec='tcp://127.0.0.1:9996', + recv_ident='') + +static_dir = Dir( + base='static/', + index_file='index.html', + default_ctype='text/plain') + +web_host = Host( + name="web.app", + routes={ + '/static/': static_dir, + '/': web_handler + }) + + +### +### Readify Server +### + +readify_serv = Server( + uuid="f400bf85-4538-4f7a-8908-67e313d515c2", + access_log="/log/m2.access.log", + error_log="/log/m2.error.log", + chroot="./", + default_host="web.app", + name="readify_serv", + pid_file="/run/mongrel2.pid", + port=6767, + hosts=[api_host, web_host]) + +settings = {"zeromq.threads": 1} + +servers = [readify_serv] diff --git a/etc/std.reqs b/etc/std.reqs new file mode 100644 index 0000000..a62ccf7 --- /dev/null +++ b/etc/std.reqs @@ -0,0 +1,5 @@ +py-bcrypt==0.2 +pymongo==2.2 +python-dateutil==2.1 +dictshield==0.4.3 + From 4ee85e177b03ac88a7fd0df4abdcb2225c6051a4 Mon Sep 17 00:00:00 2001 From: Isaac Gonzalez Date: Fri, 25 May 2012 16:02:06 -0400 Subject: [PATCH 2/2] removed files next time I'll use git mv --- api_server.py | 37 -------------------------------- mongrel2.conf | 58 -------------------------------------------------- web_server.py | 59 --------------------------------------------------- 3 files changed, 154 deletions(-) delete mode 100755 api_server.py delete mode 100644 mongrel2.conf delete mode 100755 web_server.py diff --git a/api_server.py b/api_server.py deleted file mode 100755 index 2ab47f7..0000000 --- a/api_server.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python - - -from brubeck.request_handling import Brubeck -from brubeck.connections import Mongrel2Connection - -from readify.handlers import APIListDisplayHandler -from readify.queries import init_db_conn - -import logging - - -### -### Configuration -### - -# Instantiate database connection -db_conn = init_db_conn() - -# Routing config -handler_tuples = [ - (r'^/', APIListDisplayHandler), -] - -# Application config -config = { - 'msg_conn': Mongrel2Connection('tcp://127.0.0.1:9999', 'tcp://127.0.0.1:9998'), - 'handler_tuples': handler_tuples, - 'db_conn': db_conn, - 'cookie_secret': 'OMGSOOOOOSECRET', - 'log_level': logging.DEBUG, -} - - -# Instantiate app instance -app = Brubeck(**config) -app.run() diff --git a/mongrel2.conf b/mongrel2.conf deleted file mode 100644 index de52991..0000000 --- a/mongrel2.conf +++ /dev/null @@ -1,58 +0,0 @@ -### -### API Handler -### - -api_handler = Handler( - send_spec='tcp://127.0.0.1:9999', - send_ident='34f9ceee-cd52-4b7f-b197-88bf2f0ec378', - recv_spec='tcp://127.0.0.1:9998', - recv_ident='') - -api_host = Host( - name="api.app", - routes={ - '/': api_handler - }) - - -### -### Web Handler -### - -web_handler = Handler( - send_spec='tcp://127.0.0.1:9997', - send_ident='34f9ceee-cd52-4b7f-b197-88bf2f0ec379', - recv_spec='tcp://127.0.0.1:9996', - recv_ident='') - -static_dir = Dir( - base='static/', - index_file='index.html', - default_ctype='text/plain') - -web_host = Host( - name="web.app", - routes={ - '/static/': static_dir, - '/': web_handler - }) - - -### -### Readify Server -### - -readify_serv = Server( - uuid="f400bf85-4538-4f7a-8908-67e313d515c2", - access_log="/log/m2.access.log", - error_log="/log/m2.error.log", - chroot="./", - default_host="web.app", - name="readify_serv", - pid_file="/run/mongrel2.pid", - port=6767, - hosts=[api_host, web_host]) - -settings = {"zeromq.threads": 1} - -servers = [readify_serv] diff --git a/web_server.py b/web_server.py deleted file mode 100755 index 2603b39..0000000 --- a/web_server.py +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env python - - -from brubeck.request_handling import Brubeck -from brubeck.connections import Mongrel2Connection -from brubeck.templating import load_jinja2_env - -from readify.handlers import (AccountLoginHandler, - AccountCreateHandler, - AccountLogoutHandler, - DashboardDisplayHandler, - LikedDisplayHandler, - ArchivedDisplayHandler, - ItemAddHandler, - ItemEditHandler, - SettingsHandler, - ProfilesHandler) - -from readify.queries import init_db_conn - -import logging - - -### -### Configuration -### - -# Instantiate database connection -db_conn = init_db_conn() - -# Routing config -handler_tuples = [ - (r'^/login', AccountLoginHandler), - (r'^/create', AccountCreateHandler), - (r'^/logout', AccountLogoutHandler), - (r'^/add_item', ItemAddHandler), - (r'^/edit_item/(?P\w+)', ItemEditHandler), - (r'^/settings', SettingsHandler), - (r'^/archived', ArchivedDisplayHandler), - (r'^/liked', LikedDisplayHandler), - (r'^/(?P\w+)', ProfilesHandler), - (r'^/$', DashboardDisplayHandler), -] - -# Application config -config = { - 'msg_conn': Mongrel2Connection('tcp://127.0.0.1:9997', 'tcp://127.0.0.1:9996'), - 'handler_tuples': handler_tuples, - 'template_loader': load_jinja2_env('./templates'), - 'db_conn': db_conn, - 'login_url': '/login', - 'cookie_secret': 'OMGSOOOOOSECRET', - 'log_level': logging.DEBUG, -} - - -# Instantiate app instance -app = Brubeck(**config) -app.run()