From 242eae99905d72936bbbeb8b36a3bfe538570c51 Mon Sep 17 00:00:00 2001 From: Ask Solem Date: Wed, 12 Jan 2011 14:03:33 +0100 Subject: [PATCH] djcelerymon: Added Command.stdout + Command.stderr. Closes #23 --- djcelery/management/commands/djcelerymon.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/djcelery/management/commands/djcelerymon.py b/djcelery/management/commands/djcelerymon.py index 0c0a5fcb..653e0898 100644 --- a/djcelery/management/commands/djcelerymon.py +++ b/djcelery/management/commands/djcelerymon.py @@ -1,9 +1,5 @@ -""" - -Curses Celery Event Viewer. - -""" -from threading import Thread +import sys +import threading from celery.bin import celeryev @@ -15,17 +11,20 @@ ev = celeryev.EvCommand(app=app) -class WebserverThread(Thread): +class WebserverThread(threading.Thread): def __init__(self, addrport="", *args, **options): - Thread.__init__(self) + threading.Thread.__init__(self) self.addrport = addrport self.args = args self.options = options def run(self): options = dict(self.options, use_reloader=False) - runserver.Command().handle(self.addrport, *self.args, **options) + command = runserver.Command() + # see http://code.djangoproject.com/changeset/13319 + command.stdout, command.stderr = sys.stdout, sys.stderr + command.handle(self.addrport, *self.args, **options) class Command(CeleryCommand): @@ -33,6 +32,8 @@ class Command(CeleryCommand): args = '[optional port number, or ipaddr:port]' option_list = runserver.Command.option_list + ev.get_options() help = 'Starts Django Admin instance and celerycam in the same process.' + # see http://code.djangoproject.com/changeset/13319. + stdout, stderr = sys.stdout, sys.stderr def handle(self, addrport="", *args, **options): """Handle the management command."""