Merge pull request #521 from leonidg/leonidg-misc

Leonidg misc merge. Some cleanup and a

.gitignore

@@ -1,5 +1,5 @@
 *.pyc
-perma_web/lib/phantomjs
+perma_web/lib/phantomjs*
 perma_web/perma/settings/settings.py
 perma_web/celerybeat-schedule*
 perma_web/fab_targets.py

perma_web/perma/templates/500.html

@@ -1,5 +1,5 @@
 {% extends "layout-responsive.html" %}
-{% block title %} | 404{% endblock %}
+{% block title %} | 500{% endblock %}
 {% block styles %}
 <link rel="stylesheet" href="{{ STATIC_URL }}css/font-awesome.min.css">
 {% endblock %}

perma_web/perma/urls.py

@@ -64,7 +64,7 @@
     # Link management
     url(r'^manage/?$', RedirectView.as_view(url='/manage/create/', permanent=False)),
     url(r'^manage/create/?$', 'link_management.create_link', name='create_link'),
-    url(r'^manage/create/upload?$', 'link_management.upload_file', name='upload_link'),
+    url(r'^manage/create/upload/?$', 'link_management.upload_file', name='upload_link'),
     url(r'^manage/dark-archive/%s/?$' % guid_pattern, 'link_management.dark_archive_link', name='dark_archive_link'),
     url(r'^manage/vest/%s/?$' % guid_pattern, 'link_management.vest_link', name='vest_link'),
     url(r'^manage/created-links(?P<path>/.*)?$', 'link_management.created_links', name='created_links'),
@@ -106,3 +106,5 @@
 # debug-only serving of static assets
 urlpatterns += staticfiles_urlpatterns() + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
+handler404 = 'perma.views.common.server_error_404'
+handler500 = 'perma.views.common.server_error_500'

perma_web/perma/views/common.py

@@ -1,8 +1,9 @@
 from django.core import serializers
 from django.core.files.storage import default_storage
 from django.template import RequestContext
+from django.template.loader import render_to_string
 from django.shortcuts import render_to_response
-from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect, Http404, HttpResponse
+from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect, Http404, HttpResponse, HttpResponseNotFound, HttpResponseServerError
 from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.contrib.sites.models import Site
@@ -220,3 +221,11 @@ def rate_limit(request, exception):
     """
 
     return render_to_response("rate_limit.html")
+
+## We need custom views for server errors because otherwise Django
+## doesn't send a RequestContext (meaning we don't get STATIC_ROOT).
+def server_error_404(request):
+    return HttpResponseNotFound(render_to_string('404.html', context_instance=RequestContext(request)))
+
+def server_error_500(request):
+    return HttpResponseServerError(render_to_string('500.html', context_instance=RequestContext(request)))

perma_web/perma/wsgi.py

@@ -15,6 +15,7 @@
 # mod_wsgi daemon mode with each site in its own daemon process, or use
 # os.environ["DJANGO_SETTINGS_MODULE"] = "perma.settings"
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "perma.settings")
+os.environ.setdefault("CELERY_LOADER", "django")
 
 # This application object is used by any WSGI server configured to use this
 # file. This includes Django's development server, if the WSGI_APPLICATION
@@ -28,4 +29,4 @@
     {
         '/warc': warc_application,
     }
-)
+)