From dc7b57f459baa71202e68e83d30f8d482fb3686f Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Fri, 20 Nov 2015 18:18:32 +0500
Subject: [PATCH] Cleanup some settings.
---
cms/envs/aws.py | 2 ++
cms/envs/common.py | 2 +-
lms/envs/aws.py | 8 +++-----
lms/envs/common.py | 2 +-
lms/envs/test_with_mysql.py | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 44f1861b052..80f2718b53f 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -269,6 +269,8 @@ else:
DATABASES = AUTH_TOKENS['DATABASES']
# Enable automatic transaction management on all databases
+# https://docs.djangoproject.com/en/1.8/topics/db/transactions/#tying-transactions-to-http-requests
+# This needs to be true for all databases
for database_name in DATABASES:
DATABASES[database_name]['ATOMIC_REQUESTS'] = True
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 63ae7caaa02..dc39ee2513d 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -62,7 +62,7 @@ from xmodule.mixin import LicenseMixin
# Dummy secret key for dev/test
-SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
+SECRET_KEY = 'dev key'
STUDIO_NAME = "Studio"
STUDIO_SHORT_NAME = "Studio"
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 92a629fe2ff..3b285d5e05f 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -165,7 +165,7 @@ REGISTRATION_EXTRA_FIELDS = ENV_TOKENS.get('REGISTRATION_EXTRA_FIELDS', REGISTRA
EDXMKTG_LOGGED_IN_COOKIE_NAME = ENV_TOKENS.get('EDXMKTG_LOGGED_IN_COOKIE_NAME', EDXMKTG_LOGGED_IN_COOKIE_NAME)
EDXMKTG_USER_INFO_COOKIE_NAME = ENV_TOKENS.get('EDXMKTG_USER_INFO_COOKIE_NAME', EDXMKTG_USER_INFO_COOKIE_NAME)
-ENV_FEATURES = ENV_TOKENS.get('FEATURES', ENV_TOKENS.get('MITX_FEATURES', {}))
+ENV_FEATURES = ENV_TOKENS.get('FEATURES', {})
for feature, value in ENV_FEATURES.items():
FEATURES[feature] = value
@@ -259,10 +259,6 @@ USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N)
for app in ENV_TOKENS.get('ADDL_INSTALLED_APPS', []):
INSTALLED_APPS += (app,)
-ENV_FEATURES = ENV_TOKENS.get('FEATURES', {})
-for feature, value in ENV_FEATURES.items():
- FEATURES[feature] = value
-
WIKI_ENABLED = ENV_TOKENS.get('WIKI_ENABLED', WIKI_ENABLED)
local_loglevel = ENV_TOKENS.get('LOCAL_LOGLEVEL', 'INFO')
@@ -438,6 +434,8 @@ FILE_UPLOAD_STORAGE_PREFIX = ENV_TOKENS.get('FILE_UPLOAD_STORAGE_PREFIX', FILE_U
DATABASES = AUTH_TOKENS['DATABASES']
# Enable automatic transaction management on all databases
+# https://docs.djangoproject.com/en/1.8/topics/db/transactions/#tying-transactions-to-http-requests
+# This needs to be true for all databases
for database_name in DATABASES:
DATABASES[database_name]['ATOMIC_REQUESTS'] = True
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 69763872c73..317b50f8d31 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -2676,7 +2676,7 @@ CREDIT_TASK_DEFAULT_RETRY_DELAY = 30
CREDIT_TASK_MAX_RETRIES = 5
# Dummy secret key for dev/test
-SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
+SECRET_KEY = 'dev key'
# Secret keys shared with credit providers.
# Used to digitally sign credit requests (us --> provider)
diff --git a/lms/envs/test_with_mysql.py b/lms/envs/test_with_mysql.py
index 36d3d04ec84..d46290466db 100644
--- a/lms/envs/test_with_mysql.py
+++ b/lms/envs/test_with_mysql.py
@@ -5,7 +5,7 @@ from .test import * # pylint: disable=wildcard-import
from .aws import * # pylint: disable=wildcard-import
# Dummy secret key for dev
-SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
+SECRET_KEY = 'dev key'
INSTALLED_APPS = (
'django.contrib.auth',
--
GitLab