From e6f4285de36b74a618a14270996598e9540281dd Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Wed, 17 Oct 2012 21:44:31 -0400
Subject: [PATCH] 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.

---
 gunicorn.conf.server.py |  2 +-
 requirements.txt        |  2 +-
 templates/500.html      | 13 +++----------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/gunicorn.conf.server.py b/gunicorn.conf.server.py
index 08b4f8b..df10f61 100644
--- a/gunicorn.conf.server.py
+++ b/gunicorn.conf.server.py
@@ -4,7 +4,7 @@ debug = False                    # Some extra logging
 logfile = ".gunicorn.log"        # Name of the log file
 loglevel = "info"                # The level at which to log
 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
 user = None                      # Change process owner to user
 group = None                     # Change process group to group
diff --git a/requirements.txt b/requirements.txt
index ccf4f0d..ab112e9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,6 +15,7 @@ gunicorn
 lxml
 parsedatetime
 psycopg2
+pyelasticsearch
 Pygments
 python-memcached
 python-postmark
@@ -26,7 +27,6 @@ versiontools
 Werkzeug
 
 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
 hg+https://bitbucket.org/ubernostrum/django-registration#egg=django-registration
 git+https://github.com/toastdriven/django-tastypie.git#egg=django-tastypie
diff --git a/templates/500.html b/templates/500.html
index 91f0131..ce9c503 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -1,10 +1,3 @@
-{% extends "base.html" %}
-
-{% block page-title %}Server Error - {{ block.super }}{% endblock %}
-{% block body-class %}error{% endblock %}
-{% block inline-js %}{% endblock %}
-
-{% block content %}
-    500: Server Error
-{% endblock %}
-
+500: Server Error<br />
+<br />
+We've been notified. Follow http://twitter.com/snipt for updates.