Anonymous avatar Anonymous committed b84de2c

Moved environment mangling to celerypylons.__init__, minor tweaks.

celerypylons can be installed in a webapp by either importing celeypylons::

import celerypylons

or by setting the environment variable::

CELERY_CONFIG_MODULE=celerypylons.config

Comments (0)

Files changed (2)

celerypylons/__init__.py

-#
+import os
+import warnings
+
+CELERYPYLONS_CONF = 'celerypylons.config'
+if os.environ.get('CELERY_CONFIG_MODULE', CELERYPYLONS_CONF) != CELERYPYLONS_CONF:
+    warnings.warn("'CELERY_CONFIG_MODULE' environment variable will be overridden by celery-pylons.")
+os.environ['CELERY_CONFIG_MODULE'] = CELERYPYLONS_CONF

celerypylons/commands.py

         path_to_ini_file = os.path.realpath(sys.argv[2])
         conf = paste.deploy.appconfig('config:' + path_to_ini_file)
         config.init_app(conf.global_conf,conf.local_conf)
-        if os.environ.get('CELERY_CONFIG_MODULE', None) is not None:
-            warnings.warn("'CELERY_CONFIG_MODULE' environment variable is already set but will be overridden by celery-pylons.")
     except ValueError:
         ## @@ If the user just wants to see usage or docs, don't fail on configuration
         pass
     except IndexError:
         ## @@ No configuration was passed in
         pass
-    os.environ['CELERY_CONFIG_MODULE'] = 'celerypylons.config'
 bootstrap_config()
 
 ## @@ We can now import celeryd since the configuration has been set.
 try:
     ## @@ If paster is run without arguments this file is imported,
-    ## yet there is no config file passed in, which causes these
+    ## yet there is no config file passed in which causes these
     ## imports to fail due to a configuration error.
     from celery.bin import celeryd
     from celery.bin import celerybeat
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.