diff -r 491513b6e144 -r 21cbaab383ce web/ldtplatform/settings.py --- a/web/ldtplatform/settings.py Wed Mar 09 16:48:17 2011 +0100 +++ b/web/ldtplatform/settings.py Wed Mar 09 17:41:16 2011 +0100 @@ -149,14 +149,19 @@ OAUTH_PROVIDER_CONSUMER_KEY_SIZE = 256 OAUTH_AUTHORIZE_VIEW = 'oauth_provider.views.fake_authorize_view' OAUTH_CALLBACK_VIEW = 'oauth_provider.views.fake_callback_view' -TEST_WEBSERVER_ADDRPORT = "127.0.0.1:8888" +TEST_WEBSERVER_ADDRPORT = "127.0.0.1:8000" from config import * -LOGIN_URL = BASE_URL + 'ldtplatform/accounts/login/' -LOGOUT_URL = BASE_URL + 'ldtplatform/accounts/logout/' -LOGIN_REDIRECT_URL = BASE_URL + 'ldtplatform' +if not "LOGIN_URL" in locals(): + LOGIN_URL = BASE_URL + 'ldtplatform/accounts/login/' +if not "LOGOUT_URL" in locals(): + LOGOUT_URL = BASE_URL + 'ldtplatform/accounts/logout/' +if not "LOGIN_REDIRECT_URL" in locals(): + LOGIN_REDIRECT_URL = BASE_URL + 'ldtplatform' -GLOBAL_LOG_LEVEL = LOG_LEVEL -GLOBAL_LOG_HANDLERS = [{'handler':logging.FileHandler(LOG_FILE), 'format':"%(asctime)s - %(levelname)s : %(message)s"}] +if not "GLOBAL_LOG_LEVEL" in locals(): + GLOBAL_LOG_LEVEL = LOG_LEVEL +if not "GLOBAL_LOG_HANDLERS" in locals(): + GLOBAL_LOG_HANDLERS = [{'handler':logging.FileHandler(LOG_FILE), 'format':"%(asctime)s - %(levelname)s : %(message)s"}]