Don't bomb out on misconfigured environment variables

mikebryant · Jul 14, 2015 · 64a8cce · 64a8cce
1 parent 448b438
commit 64a8cce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/django_autoconfig/environment_settings/autoconfig.py b/django_autoconfig/environment_settings/autoconfig.py
@@ -1,8 +1,11 @@
 '''Pull settings from environment variables.'''
 
 import ast
+import logging
 import os
 
+LOGGER = logging.getLogger(__name__)
+
 
 def get_settings_from_environment(environ):
     '''Deduce settings from environment variables'''
@@ -11,7 +14,10 @@ def get_settings_from_environment(environ):
         if not name.startswith('DJANGO_'):
             continue
         name = name.replace('DJANGO_', '', 1)
-        settings[name] = ast.literal_eval(value)
+        try:
+            settings[name] = ast.literal_eval(value)
+        except ValueError as err:
+            LOGGER.warn("Unable to parse setting %s=%s (%s)", name, value, err)
     return settings
 
 SETTINGS = get_settings_from_environment(os.environ)
diff --git a/django_autoconfig/tests/__init__.py b/django_autoconfig/tests/__init__.py
@@ -202,7 +202,10 @@ def test_environment_settings(self):
         '''
         import django_autoconfig.environment_settings.autoconfig
         results = django_autoconfig.environment_settings.autoconfig.get_settings_from_environment(
-            {'DJANGO_BLAH': '"test-value"'},
+            {
+                'DJANGO_BLAH': '"test-value"',
+                'DJANGO_DONTWORK': 'flibble',
+            },
         )
         self.assertEqual(results, {'BLAH': 'test-value'})