Browse Source

celeryd: Add current working directory to sys.path for convenience. (maybe this is bad, have to think about the risks involved, but it's certinaly convenient.)

Ask Solem 16 years ago
parent
commit
c6f4922be9
10 changed files with 22 additions and 0 deletions
  1. 4 0
      celery/__init__.py
  2. 1 0
      celery/bin/celeryd
  3. 2 0
      celery/discovery.py
  4. 2 0
      celery/log.py
  5. 2 0
      celery/managers.py
  6. 2 0
      celery/messaging.py
  7. 2 0
      celery/models.py
  8. 2 0
      celery/platform.py
  9. 2 0
      celery/process.py
  10. 3 0
      celery/task.py

+ 4 - 0
celery/__init__.py

@@ -5,3 +5,7 @@ __author__ = "Ask Solem"
 __contact__ = "askh@opera.com"
 __contact__ = "askh@opera.com"
 __homepage__ = "http://github.com/ask/celery/"
 __homepage__ = "http://github.com/ask/celery/"
 __docformat__ = "restructuredtext"
 __docformat__ = "restructuredtext"
+
+__all__ = ["bin", "conf", "discovery", "log", "managers",
+           "messaging", "models", "platform", "process",
+           "registry", "task", "urls", "views", "worker"]

+ 1 - 0
celery/bin/celeryd

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 #!/usr/bin/env python
 import os
 import os
 import sys
 import sys
+sys.path.append(os.getcwd())
 django_project_dir = os.environ.get("DJANGO_PROJECT_DIR")
 django_project_dir = os.environ.get("DJANGO_PROJECT_DIR")
 if django_project_dir:
 if django_project_dir:
     sys.path.append(django_project_dir)
     sys.path.append(django_project_dir)

+ 2 - 0
celery/discovery.py

@@ -2,6 +2,8 @@ import imp
 from django.conf import settings
 from django.conf import settings
 from django.core import exceptions
 from django.core import exceptions
 
 
+__all__ = ["autodiscover", "tasks_for_app", "find_related_module"]
+
 
 
 def autodiscover():
 def autodiscover():
     """Include tasks for all applications in settings.INSTALLED_APPS."""
     """Include tasks for all applications in settings.INSTALLED_APPS."""

+ 2 - 0
celery/log.py

@@ -4,6 +4,8 @@ import time
 import logging
 import logging
 from celery.conf import LOG_FORMAT, DAEMON_LOG_LEVEL
 from celery.conf import LOG_FORMAT, DAEMON_LOG_LEVEL
 
 
+__all__ = ["setup_logger", "emergency_error"]
+
 
 
 def setup_logger(loglevel=DAEMON_LOG_LEVEL, logfile=None, format=LOG_FORMAT):
 def setup_logger(loglevel=DAEMON_LOG_LEVEL, logfile=None, format=LOG_FORMAT):
     """Setup the ``multiprocessing`` logger. If ``logfile`` is not specified,
     """Setup the ``multiprocessing`` logger. If ``logfile`` is not specified,

+ 2 - 0
celery/managers.py

@@ -2,6 +2,8 @@ from django.db import models
 from celery.registry import tasks
 from celery.registry import tasks
 from datetime import datetime, timedelta
 from datetime import datetime, timedelta
 
 
+__all__ = ["PeriodicTaskManager"]
+
 
 
 class PeriodicTaskManager(models.Manager):
 class PeriodicTaskManager(models.Manager):
 
 

+ 2 - 0
celery/messaging.py

@@ -1,6 +1,8 @@
 from carrot.messaging import Publisher, Consumer
 from carrot.messaging import Publisher, Consumer
 import uuid
 import uuid
 
 
+__all__ = ["NoProcessConsumer", "TaskPublisher", "TaskConsumer"]
+
 
 
 class NoProcessConsumer(Consumer):
 class NoProcessConsumer(Consumer):
     
     

+ 2 - 0
celery/models.py

@@ -3,6 +3,8 @@ from celery.registry import tasks
 from celery.managers import PeriodicTaskManager
 from celery.managers import PeriodicTaskManager
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _
 
 
+__all__ = ["PeriodicTaskMeta"]
+
 
 
 class PeriodicTaskMeta(models.Model):
 class PeriodicTaskMeta(models.Model):
     name = models.CharField(_(u"name"), max_length=255, unique=True)
     name = models.CharField(_(u"name"), max_length=255, unique=True)

+ 2 - 0
celery/platform.py

@@ -3,6 +3,8 @@ import sys
 import errno
 import errno
 import resource
 import resource
 
 
+__all__ = ["PIDFile", "remove_pidfile", "daemonize"]
+
 # File mode creation mask of the daemon.
 # File mode creation mask of the daemon.
 # No point in changing this, as we don't really create any files.
 # No point in changing this, as we don't really create any files.
 DAEMON_UMASK = 0
 DAEMON_UMASK = 0

+ 2 - 0
celery/process.py

@@ -1,6 +1,8 @@
 from UserList import UserList
 from UserList import UserList
 from celery.task import mark_as_done
 from celery.task import mark_as_done
 
 
+__all__ = ["ProcessQueue"]
+
 
 
 class ProcessQueue(UserList):
 class ProcessQueue(UserList):
     """Queue of running child processes, which starts waiting for the
     """Queue of running child processes, which starts waiting for the

+ 3 - 0
celery/task.py

@@ -5,6 +5,9 @@ from celery.messaging import TaskPublisher, TaskConsumer
 from django.core.cache import cache
 from django.core.cache import cache
 from datetime import timedelta
 from datetime import timedelta
 
 
+__all__ = ["delay_task", "discard_all", "gen_task_done_cache_key",
+           "mark_as_done", "is_done", "Task", "PeriodicTask", "TestTask"]
+
 
 
 def delay_task(task_name, **kwargs):
 def delay_task(task_name, **kwargs):
     if task_name not in tasks:
     if task_name not in tasks: