From 46afb979e2d0e0b79ace7b8ee3a026eaf1055a30 Mon Sep 17 00:00:00 2001 From: benoitc Date: Sat, 28 Jun 2014 17:06:18 +0200 Subject: [PATCH] Revert "swicth confing load order" This reverts commit b5aab16bf590cacff1825410d9cfaea925de5b24. Change was broken. If we simply switch there, the error when loading the config will not be reported correctly. We should find a better way. --- gunicorn/app/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gunicorn/app/base.py b/gunicorn/app/base.py index 2e96eda5..bc6ea188 100644 --- a/gunicorn/app/base.py +++ b/gunicorn/app/base.py @@ -107,9 +107,9 @@ class Application(BaseApplication): """ try: - cfg = self.get_config_from_filename(filename=location) - except ImportError: cfg = self.get_config_from_module_name(module_name=location) + except ImportError: + cfg = self.get_config_from_filename(filename=location) for k, v in cfg.items(): # Ignore unknown names