Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix importing config from env var #2983

Merged
merged 2 commits into from
Jun 20, 2017
Merged

Fix importing config from env var #2983

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cddc28f
Fix importing config from env var
andrewmchen Jun 16, 2017
08c9954
Merge branch 'master' into master
andrewmchen Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion superset/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import imp
import json
import os
import sys
from collections import OrderedDict

from dateutil import tz
Expand Down Expand Up @@ -308,7 +309,12 @@ class CeleryConfig(object):
# for case where app is being executed via pex.
print('Loaded your LOCAL configuration at [{}]'.format(
os.environ[CONFIG_PATH_ENV_VAR]))
imp.load_source('superset_config', os.environ[CONFIG_PATH_ENV_VAR])
module = sys.modules[__name__]
override_conf = imp.load_source('superset_config', os.environ[CONFIG_PATH_ENV_VAR])
for key in dir(override_conf):
if key.isupper():
setattr(module, key, getattr(override_conf, key))

else:
from superset_config import * # noqa
import superset_config
Expand Down