Changing the global socket timeout is evil

[osqa.git] / settings_local.py.dist

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 31ad2263914e61679363fde3670348491abab26a..b85d89b9b96e4d345658f80d4f49d81f07f37240 100644 (file)
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -3,14 +3,33 @@ import os.path
 
 SITE_SRC_ROOT = os.path.dirname(__file__)
 LOG_FILENAME = 'django.osqa.log'
 
 SITE_SRC_ROOT = os.path.dirname(__file__)
 LOG_FILENAME = 'django.osqa.log'

-
-#for logging
-import logging
-logging.basicConfig(
-    filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME),
-    level=logging.ERROR,
-    format='%(pathname)s TIME: %(asctime)s MSG: %(filename)s:%(funcName)s:%(lineno)d %(message)s',
-)
+LOGGING = {
+    'version': 1,
+    'formatters': {
+        'default': {
+            'format': '%(pathname)s TIME: %(asctime)s MSG: %(filename)s:%(funcName)s:%(lineno)d %(message)s',
+        }
+    },
+    'handlers': {
+        'file': {
+            'level': 'DEBUG',
+            'class': 'logging.FileHandler',
+            'formatter': 'default',
+            'filename': os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME),
+        },
+    },
+    'loggers' : {
+        # ensure that all log entries are propagated to root
+        'django': { 'propagate': True },
+        'django.request': { 'propagate': True },
+        'django.security': { 'propagate': True },
+        'py.warnings': { 'propagate': True },
+    },
+    'root': {
+        'handlers': ['file'],
+        'level': 'DEBUG',
+    },
+}

 
 #ADMINS and MANAGERS
 ADMINS = ()
 
 #ADMINS and MANAGERS
 ADMINS = ()


@@ -32,12 +51,18 @@ DATABASES = {
         'PASSWORD': '',
         'HOST': '',
         'PORT': '',
         'PASSWORD': '',
         'HOST': '',
         'PORT': '',

+        'CONN_MAX_AGE': 600,

     }
 }
 
 CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').replace('\\','/')
 #CACHE_BACKEND = 'dummy://'
 SESSION_ENGINE = 'django.contrib.sessions.backends.db'
     }
 }
 
 CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').replace('\\','/')
 #CACHE_BACKEND = 'dummy://'
 SESSION_ENGINE = 'django.contrib.sessions.backends.db'

+# Customize the values below if OSQA is in a subfolder and especially you're planning on
+# running multiple Django applications (OSQA or others) on the same domain in different
+# subfolders
+#SESSION_COOKIE_PATH = '/'
+#CSRF_COOKIE_PATH = '/'

 
 # This should be equal to your domain name, plus the web application context.
 # This shouldn't be followed by a trailing slash.
 
 # This should be equal to your domain name, plus the web application context.
 # This shouldn't be followed by a trailing slash.


@@ -52,7 +77,6 @@ TIME_ZONE = 'America/New_York'
 USE_I18N = True
 LANGUAGE_CODE = 'en'
 
 USE_I18N = True
 LANGUAGE_CODE = 'en'
 

-DJANGO_VERSION = 1.1

 OSQA_DEFAULT_SKIN = 'default'
 
 OSQA_DEFAULT_SKIN = 'default'
 

-DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']
+DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'stats']