Merge branch 'brosner/fixes'

celery/bin/celeryd.py

@@ -66,6 +66,7 @@ from celery import conf
 from celery import discovery
 from celery.task import discard_all
 from celery.worker import WorkController
+import multiprocessing
 import traceback
 import optparse
 import atexit
@@ -117,6 +118,8 @@ def run_worker(concurrency=DAEMON_CONCURRENCY, daemon=False,
         pidfile=DAEMON_PID_FILE, umask=0, uid=None, gid=None,
         working_directory=None, chroot=None, **kwargs):
     """Run the celery daemon."""
+    if not concurrency:
+        concurrency = multiprocessing.cpu_count()
     if settings.DATABASE_ENGINE == "sqlite3" and concurrency > 1:
         import warnings
         warnings.warn("The sqlite3 database engine doesn't support "

celery/conf.py

@@ -7,7 +7,7 @@ DEFAULT_AMQP_PUBLISHER_ROUTING_KEY = "celery"
 DEFAULT_AMQP_CONSUMER_ROUTING_KEY = "celery"
 DEFAULT_AMQP_CONSUMER_QUEUE = "celery"
 DEFAULT_AMQP_EXCHANGE_TYPE = "direct"
-DEFAULT_DAEMON_CONCURRENCY = 10
+DEFAULT_DAEMON_CONCURRENCY = 0 # defaults to cpu count
 DEFAULT_DAEMON_PID_FILE = "celeryd.pid"
 DEFAULT_LOG_FMT = '[%(asctime)s: %(levelname)s/%(processName)s] %(message)s'
 DEFAULT_DAEMON_LOG_LEVEL = "INFO"

celery/views.py

@@ -8,7 +8,7 @@ from carrot.serialization import serialize as JSON_dump
 def is_task_done(request, task_id):
     """Returns task execute status in JSON format."""
     response_data = {"task": {"id": task_id, "executed": is_done(task_id)}}
-    return HttpResponse(JSON_dump(response_data))
+    return HttpResponse(JSON_dump(response_data), mimetype="application/json")
 
 
 def task_status(request, task_id):
@@ -27,4 +27,4 @@ def task_status(request, task_id):
             "status": status,
             "result": async_result.result,
         }
-    return HttpResponse(JSON_dump({"task": response_data}))
+    return HttpResponse(JSON_dump({"task": response_data}), mimetype="application/json")