Commit 9619bf20 by David Ormsbee

moved logging level to INFO, replaced tabs with spaces in settings.py

parent 4e75a04f
if 'COURSEWARE_ENABLED' not in locals(): if 'COURSEWARE_ENABLED' not in locals():
COURSEWARE_ENABLED = True COURSEWARE_ENABLED = True
if 'ASKBOT_ENABLED' not in locals(): if 'ASKBOT_ENABLED' not in locals():
ASKBOT_ENABLED = True ASKBOT_ENABLED = True
if not COURSEWARE_ENABLED: if not COURSEWARE_ENABLED:
ASKBOT_ENABLED = False ASKBOT_ENABLED = False
# Defaults to be overridden # Defaults to be overridden
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
...@@ -25,7 +25,7 @@ DEBUG = True ...@@ -25,7 +25,7 @@ DEBUG = True
TEMPLATE_DEBUG = DEBUG TEMPLATE_DEBUG = DEBUG
ADMINS = ( ADMINS = (
('Piotr Mitros', 'pmitros@csail.mit.edu'), ('Piotr Mitros', 'pmitros@csail.mit.edu'),
) )
MANAGERS = ADMINS MANAGERS = ADMINS
...@@ -74,14 +74,14 @@ TEMPLATE_LOADERS = ( ...@@ -74,14 +74,14 @@ TEMPLATE_LOADERS = (
) )
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'track.middleware.TrackMiddleware', 'track.middleware.TrackMiddleware',
'djangomako.middleware.MakoMiddleware', 'djangomako.middleware.MakoMiddleware',
#'debug_toolbar.middleware.DebugToolbarMiddleware', #'debug_toolbar.middleware.DebugToolbarMiddleware',
) )
ROOT_URLCONF = 'mitx.urls' ROOT_URLCONF = 'mitx.urls'
...@@ -125,7 +125,7 @@ LOGGING = { ...@@ -125,7 +125,7 @@ LOGGING = {
'loggers': { 'loggers': {
'django.request': { 'django.request': {
'handlers': ['mail_admins'], 'handlers': ['mail_admins'],
'level': 'ERROR', 'level': 'INFO',
'propagate': True, 'propagate': True,
}, },
} }
...@@ -141,104 +141,104 @@ MAXLOG = 500 ...@@ -141,104 +141,104 @@ MAXLOG = 500
execfile("../settings.py") execfile("../settings.py")
if PERFSTATS : if PERFSTATS :
MIDDLEWARE_CLASSES = ( 'perfstats.middleware.ProfileMiddleware',) + MIDDLEWARE_CLASSES MIDDLEWARE_CLASSES = ( 'perfstats.middleware.ProfileMiddleware',) + MIDDLEWARE_CLASSES
if 'TRACK_DIR' not in locals(): if 'TRACK_DIR' not in locals():
TRACK_DIR = BASE_DIR+'/track_dir/' TRACK_DIR = BASE_DIR+'/track_dir/'
if 'ASKBOT_EXTRA_SKINS_DIR' not in locals(): if 'ASKBOT_EXTRA_SKINS_DIR' not in locals():
ASKBOT_EXTRA_SKINS_DIR = BASE_DIR+'/askbot/skins' ASKBOT_EXTRA_SKINS_DIR = BASE_DIR+'/askbot/skins'
if 'ASKBOT_DIR' not in locals(): if 'ASKBOT_DIR' not in locals():
ASKBOT_DIR = BASE_DIR ASKBOT_DIR = BASE_DIR
if 'STATIC_ROOT' not in locals(): if 'STATIC_ROOT' not in locals():
STATIC_ROOT = BASE_DIR+'/staticroot/' STATIC_ROOT = BASE_DIR+'/staticroot/'
if 'DATA_DIR' not in locals(): if 'DATA_DIR' not in locals():
DATA_DIR = BASE_DIR+'/data/' DATA_DIR = BASE_DIR+'/data/'
if 'TEXTBOOK_DIR' not in locals(): if 'TEXTBOOK_DIR' not in locals():
TEXTBOOK_DIR = BASE_DIR+'/textbook/' TEXTBOOK_DIR = BASE_DIR+'/textbook/'
if 'TEMPLATE_DIRS' not in locals(): if 'TEMPLATE_DIRS' not in locals():
TEMPLATE_DIRS = ( TEMPLATE_DIRS = (
BASE_DIR+'/templates/', BASE_DIR+'/templates/',
DATA_DIR+'/templates', DATA_DIR+'/templates',
TEXTBOOK_DIR, TEXTBOOK_DIR,
) )
if 'STATICFILES_DIRS' not in locals(): if 'STATICFILES_DIRS' not in locals():
STATICFILES_DIRS = ( STATICFILES_DIRS = (
BASE_DIR+'/3rdParty/static', BASE_DIR+'/3rdParty/static',
BASE_DIR+'/static' BASE_DIR+'/static'
) )
if ASKBOT_ENABLED: if ASKBOT_ENABLED:
import sys import sys
sys.path.append(ASKBOT_DIR) sys.path.append(ASKBOT_DIR)
import os import os
import askbot import askbot
import site import site
site.addsitedir(os.path.join(os.path.dirname(askbot.__file__), 'deps')) site.addsitedir(os.path.join(os.path.dirname(askbot.__file__), 'deps'))
TEMPLATE_LOADERS = TEMPLATE_LOADERS + ('askbot.skins.loaders.filesystem_load_template_source',) TEMPLATE_LOADERS = TEMPLATE_LOADERS + ('askbot.skins.loaders.filesystem_load_template_source',)
MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + ( MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware', 'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware',
'askbot.middleware.pagesize.QuestionsPageSizeMiddleware', 'askbot.middleware.pagesize.QuestionsPageSizeMiddleware',
'askbot.middleware.cancel.CancelActionMiddleware', 'askbot.middleware.cancel.CancelActionMiddleware',
'django.middleware.transaction.TransactionMiddleware', 'django.middleware.transaction.TransactionMiddleware',
'askbot.middleware.view_log.ViewLogMiddleware', 'askbot.middleware.view_log.ViewLogMiddleware',
'askbot.middleware.spaceless.SpacelessMiddleware', 'askbot.middleware.spaceless.SpacelessMiddleware',
'askbot.middleware.forum_mode.ForumModeMiddleware', 'askbot.middleware.forum_mode.ForumModeMiddleware',
) )
FILE_UPLOAD_TEMP_DIR = os.path.join( FILE_UPLOAD_TEMP_DIR = os.path.join(
os.path.dirname(__file__), os.path.dirname(__file__),
'tmp' 'tmp'
).replace('\\','/') ).replace('\\','/')
FILE_UPLOAD_HANDLERS = ( FILE_UPLOAD_HANDLERS = (
'django.core.files.uploadhandler.MemoryFileUploadHandler', 'django.core.files.uploadhandler.MemoryFileUploadHandler',
'django.core.files.uploadhandler.TemporaryFileUploadHandler', 'django.core.files.uploadhandler.TemporaryFileUploadHandler',
) )
ASKBOT_ALLOWED_UPLOAD_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff') ASKBOT_ALLOWED_UPLOAD_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
ASKBOT_MAX_UPLOAD_FILE_SIZE = 1024 * 1024 #result in bytes ASKBOT_MAX_UPLOAD_FILE_SIZE = 1024 * 1024 #result in bytes
ASKBOT_FILE_UPLOAD_DIR = os.path.join(os.path.dirname(__file__), 'askbot', 'upfiles') MEDIA_ROOT = os.path.join(os.path.dirname(__file__), 'askbot', 'upfiles')
DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage' DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
PROJECT_ROOT = os.path.dirname(__file__) PROJECT_ROOT = os.path.dirname(__file__)
TEMPLATE_CONTEXT_PROCESSORS = ( TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.request', 'django.core.context_processors.request',
'askbot.context.application_settings', 'askbot.context.application_settings',
#'django.core.context_processors.i18n', #'django.core.context_processors.i18n',
'askbot.user_messages.context_processors.user_messages',#must be before auth 'askbot.user_messages.context_processors.user_messages',#must be before auth
'django.core.context_processors.auth', #this is required for admin 'django.core.context_processors.auth', #this is required for admin
'django.core.context_processors.csrf', #necessary for csrf protection 'django.core.context_processors.csrf', #necessary for csrf protection
) )
INSTALLED_APPS = INSTALLED_APPS + ( INSTALLED_APPS = INSTALLED_APPS + (
'django.contrib.sitemaps', 'django.contrib.sitemaps',
'django.contrib.admin', 'django.contrib.admin',
'south', 'south',
'askbot.deps.livesettings', 'askbot.deps.livesettings',
'askbot', 'askbot',
#'keyedcache', # TODO: Main askbot tree has this installed, but we get intermittent errors if we include it. #'keyedcache', # TODO: Main askbot tree has this installed, but we get intermittent errors if we include it.
'robots', 'robots',
'django_countries', 'django_countries',
'djcelery', 'djcelery',
'djkombu', 'djkombu',
'followit', 'followit',
) )
CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
ASKBOT_URL = 'discussion/' ASKBOT_URL = 'discussion/'
LOGIN_REDIRECT_URL = '/' LOGIN_REDIRECT_URL = '/'
LOGIN_URL = '/' LOGIN_URL = '/'
ASKBOT_UPLOADED_FILES_URL = '%s%s' % (ASKBOT_URL, 'upfiles/') MEDIA_URL = '/%s%s' % (ASKBOT_URL, 'upfiles/')
ALLOW_UNICODE_SLUGS = False ALLOW_UNICODE_SLUGS = False
ASKBOT_USE_STACKEXCHANGE_URLS = False #mimic url scheme of stackexchange ASKBOT_USE_STACKEXCHANGE_URLS = False #mimic url scheme of stackexchange
ASKBOT_CSS_DEVEL = True ASKBOT_CSS_DEVEL = True
#Celery Settings #Celery Settings
BROKER_TRANSPORT = "djkombu.transport.DatabaseTransport" BROKER_TRANSPORT = "djkombu.transport.DatabaseTransport"
CELERY_ALWAYS_EAGER = True CELERY_ALWAYS_EAGER = True
import djcelery import djcelery
djcelery.setup_loader() djcelery.setup_loader()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment