Make RequestHolder thread-safe

[osqa.git] / settings.py

diff --git a/settings.py b/settings.py
index f1c6f6b29a257f30730762bfb1194236409e4cc4..cd153f4aef101e455ca63fb81d41bd4fe7a528b1 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -7,14 +7,11 @@ SITE_ID = 1
 ADMIN_MEDIA_PREFIX = '/admin_media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 
 ADMIN_MEDIA_PREFIX = '/admin_media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 

-TEMPLATE_LOADERS = [
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-    'forum.modules.template_loader.module_templates_loader',
-    'forum.skins.load_template_source',
-]
+CACHE_MAX_KEY_LENGTH = 235

 
 MIDDLEWARE_CLASSES = [
 
 MIDDLEWARE_CLASSES = [

+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.middleware.csrf.CsrfResponseMiddleware',

     'forum.middleware.django_cookies.CookiePreHandlerMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'forum.middleware.django_cookies.CookiePreHandlerMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',


@@ -23,22 +20,10 @@ MIDDLEWARE_CLASSES = [
     'forum.middleware.request_utils.RequestUtils',
     'forum.middleware.cancel.CancelActionMiddleware',
     'forum.middleware.admin_messages.AdminMessagesMiddleware',
     'forum.middleware.request_utils.RequestUtils',
     'forum.middleware.cancel.CancelActionMiddleware',
     'forum.middleware.admin_messages.AdminMessagesMiddleware',

+    'forum.middleware.custom_pages.CustomPagesFallbackMiddleware',

     'django.middleware.transaction.TransactionMiddleware',
     'forum.middleware.django_cookies.CookiePostHandlerMiddleware',
 ]
     'django.middleware.transaction.TransactionMiddleware',
     'forum.middleware.django_cookies.CookiePostHandlerMiddleware',
 ]

-# Backwards compatibility. If we fail to import the CSRF middle-ware from the location
-# where it is supposed to be, we add the old middle-ware classes to the classes list.
-try:
-    from django.middleware.csrf import CsrfViewMiddleware
-    MIDDLEWARE_CLASSES = [
-        'django.middleware.csrf.CsrfViewMiddleware',
-        'django.middleware.csrf.CsrfResponseMiddleware',
-    ] + MIDDLEWARE_CLASSES
-except ImportError:
-    MIDDLEWARE_CLASSES = [
-        'django.contrib.csrf.middleware.CsrfViewMiddleware',
-        'django.contrib.csrf.middleware.CsrfResponseMiddleware',
-    ] + MIDDLEWARE_CLASSES

 
 TEMPLATE_CONTEXT_PROCESSORS = [
     'django.core.context_processors.request',
 
 TEMPLATE_CONTEXT_PROCESSORS = [
     'django.core.context_processors.request',


@@ -66,6 +51,23 @@ ALLOW_MAX_FILE_SIZE = 1024 * 1024
 # User settings
 from settings_local import *
 
 # User settings
 from settings_local import *
 

+if DEBUG:
+    TEMPLATE_LOADERS = [
+        'django.template.loaders.filesystem.load_template_source',
+        'django.template.loaders.app_directories.load_template_source',
+        'forum.modules.template_loader.module_templates_loader',
+        'forum.skins.load_template_source',
+    ]
+else:
+    TEMPLATE_LOADERS = [
+        ('django.template.loaders.cached.Loader',(
+            'django.template.loaders.filesystem.load_template_source',
+            'django.template.loaders.app_directories.load_template_source',
+            'forum.modules.template_loader.module_templates_loader',
+            'forum.skins.load_template_source',
+            )),
+    ]
+

 try:
     if len(FORUM_SCRIPT_ALIAS) > 0:
         APP_URL = '%s/%s' % (APP_URL, FORUM_SCRIPT_ALIAS[:-1])
 try:
     if len(FORUM_SCRIPT_ALIAS) > 0:
         APP_URL = '%s/%s' % (APP_URL, FORUM_SCRIPT_ALIAS[:-1])


@@ -133,6 +135,13 @@ try:
 except:
     pass
 
 except:
     pass
 

+# Try loading Gunicorn web server
+try:
+    import gunicorn
+    INSTALLED_APPS.append('gunicorn')
+except ImportError:
+    pass
+

 if not DEBUG:
     try:
         import rosetta
 if not DEBUG:
     try:
         import rosetta