kallithea Changeset - fe8c2e881403

Changeset - fe8c2e881403

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 14 years ago 2011-11-26 01:23:28
marcin@python-works.com

moved pylons config out of global scope for celerypylons

2 files changed with 3 insertions and 2 deletions:

rhodecode/config/environment.py

rhodecode/lib/celerypylons/commands.py

0 comments (0 inline, 0 general)

rhodecode/config/environment.py

➞

Show inline comments

@@ @@ -36,13 +36,13 @@ def load_environment(global_conf, app_co @@
                  static_files=os.path.join(root, 'public'),
                  templates=[os.path.join(root, 'templates')])
     # Initialize config with the basic options
     config.init_app(global_conf, app_conf, package='rhodecode', paths=paths)
-    # store some globals into our main isntance
+    # store some globals into rhodecode
     rhodecode.CELERY_ON = str2bool(config['app_conf'].get('use_celery'))
     rhodecode.CONFIG = config
     config['routes.map'] = make_map(config)
     config['pylons.app_globals'] = app_globals.Globals(config)
     config['pylons.h'] = rhodecode.lib.helpers

rhodecode/lib/celerypylons/commands.py

➞

Show inline comments

 from rhodecode.lib.utils import BasePasterCommand, Command
 from celery.app import app_or_default
 from celery.bin import camqadm, celerybeat, celeryd, celeryev
-from pylons import config
 from rhodecode.lib import str2bool
 __all__ = ['CeleryDaemonCommand', 'CeleryBeatCommand',
            'CAMQPAdminCommand', 'CeleryEventCommand']
@@ @@ -25,12 +25,13 @@ class CeleryCommand(BasePasterCommand): @@
         cmd = self.celery_command(app_or_default())
         for x in cmd.get_options():
             self.parser.add_option(x)
     def command(self):
         from pylons import config
         try:
             CELERY_ON = str2bool(config['app_conf'].get('use_celery'))
         except KeyError:
             CELERY_ON = False
         if CELERY_ON == False:

0 comments (0 inline, 0 general)