500 page that doesn't look like shit when the server actually... throws a 500. Update requirements to use pyelasticsearch from pip because the one on GitHub (you know, the one that was suggested we use) is now throwing all sorts of errors. And update the guni procs on the server.

master
Nick Sergeant 2012-10-17 21:44:31 -04:00
parent f706adf341
commit e6f4285de3
3 changed files with 5 additions and 12 deletions

View File

@ -4,7 +4,7 @@ debug = False # Some extra logging
logfile = ".gunicorn.log" # Name of the log file logfile = ".gunicorn.log" # Name of the log file
loglevel = "info" # The level at which to log loglevel = "info" # The level at which to log
pidfile = ".gunicorn.pid" # Path to a PID file pidfile = ".gunicorn.pid" # Path to a PID file
workers = 9 # Number of workers to initialize workers = 3 # Number of workers to initialize
umask = 0 # Umask to set when daemonizing umask = 0 # Umask to set when daemonizing
user = None # Change process owner to user user = None # Change process owner to user
group = None # Change process group to group group = None # Change process group to group

View File

@ -15,6 +15,7 @@ gunicorn
lxml lxml
parsedatetime parsedatetime
psycopg2 psycopg2
pyelasticsearch
Pygments Pygments
python-memcached python-memcached
python-postmark python-postmark
@ -26,7 +27,6 @@ versiontools
Werkzeug Werkzeug
git+git://github.com/dlo/bottlenose.git git+git://github.com/dlo/bottlenose.git
git+git://github.com/toastdriven/pyelasticsearch.git
git+https://github.com/toastdriven/django-haystack.git@master#egg=django-haystack git+https://github.com/toastdriven/django-haystack.git@master#egg=django-haystack
hg+https://bitbucket.org/ubernostrum/django-registration#egg=django-registration hg+https://bitbucket.org/ubernostrum/django-registration#egg=django-registration
git+https://github.com/toastdriven/django-tastypie.git#egg=django-tastypie git+https://github.com/toastdriven/django-tastypie.git#egg=django-tastypie

View File

@ -1,10 +1,3 @@
{% extends "base.html" %} 500: Server Error<br />
<br />
{% block page-title %}Server Error - {{ block.super }}{% endblock %} We've been notified. Follow http://twitter.com/snipt for updates.
{% block body-class %}error{% endblock %}
{% block inline-js %}{% endblock %}
{% block content %}
500: Server Error
{% endblock %}