From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 8 May 2013 20:20:27 +0000 (-0500)
Subject: Fixing API setup with new plugin "config spec" world
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=230b5eb2eb9ae9c2b0930bbd2e32dc963b90b9fc;p=mediagoblin.git

Fixing API setup with new plugin "config spec" world

It shouldn't reference the config until in the setup_plugin() method,
else there's a race condition.
---

diff --git a/mediagoblin/plugins/api/__init__.py b/mediagoblin/plugins/api/__init__.py
index d3fdf2ef..1eddd9e0 100644
--- a/mediagoblin/plugins/api/__init__.py
+++ b/mediagoblin/plugins/api/__init__.py
@@ -23,11 +23,11 @@ _log = logging.getLogger(__name__)
 
 PLUGIN_DIR = os.path.dirname(__file__)
 
-config = pluginapi.get_config(__name__)
-
 def setup_plugin():
     _log.info('Setting up API...')
 
+    config = pluginapi.get_config(__name__)
+
     _log.debug('API config: {0}'.format(config))
 
     routes = [