celery: make celery load config from pyramid_app if available

otherwise pylons.config to make sure celery config works
without pylons context

rhodecode/lib/celerypylons/loader.py

@@ -1,93 +1,97 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2012-2016  RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import pylons
 import rhodecode
-from pylons import config
 
 from celery.loaders.base import BaseLoader
 
 to_pylons = lambda x: x.replace('_', '.').lower()
 to_celery = lambda x: x.replace('.', '_').upper()
 
 LIST_PARAMS = """CELERY_IMPORTS ADMINS ROUTES""".split()
 
 class PylonsSettingsProxy(object):
     """Pylons Settings Proxy
 
     Proxies settings from pylons.config
 
     """
     def __getattr__(self, key):
         pylons_key = to_pylons(key)
+        proxy_config = rhodecode.PYRAMID_SETTINGS or pylons.config
         try:
-            value = rhodecode.PYRAMID_SETTINGS[pylons_key]
-            if key in LIST_PARAMS:return value.split()
+            value = proxy_config[pylons_key]
+            if key in LIST_PARAMS:
+                return value.split()
             return self.type_converter(value)
         except KeyError:
             raise AttributeError(pylons_key)
 
     def get(self, key):
         try:
             return self.__getattr__(key)
         except AttributeError:
             return None
 
     def __getitem__(self, key):
         try:
             return self.__getattr__(key)
         except AttributeError:
             raise KeyError()
 
     def __setattr__(self, key, value):
         pylons_key = to_pylons(key)
-        rhodecode.PYRAMID_SETTINGS[pylons_key] = value
+        proxy_config = rhodecode.PYRAMID_SETTINGS or pylons.config
+        proxy_config[pylons_key] = value
 
     def __setitem__(self, key, value):
         self.__setattr__(key, value)
 
     def type_converter(self, value):
         #cast to int
         if value.isdigit():
             return int(value)
 
         #cast to bool
         if value.lower() in ['true', 'false']:
             return value.lower() == 'true'
         return value
 
 class PylonsLoader(BaseLoader):
     """Pylons celery loader
 
     Maps the celery config onto pylons.config
 
     """
     def read_configuration(self):
         self.configured = True
         return PylonsSettingsProxy()
 
     def on_worker_init(self):
         """
         Import task modules.
         """
         self.import_default_modules()
         from rhodecode.config.middleware import make_pyramid_app
 
         # adding to self to keep a reference around
-        self.pyramid_app = make_pyramid_app(config, **config['app_conf'])
+        self.pyramid_app = make_pyramid_app(
+            pylons.config, **pylons.config['app_conf'])