Explorar el Código

Wording: Got task from broker -> Received task

Ask Solem hace 11 años
padre
commit
1eb681c4cf

+ 1 - 1
celery/worker/strategy.py

@@ -52,7 +52,7 @@ def default(task, app, consumer,
             return
 
         if _does_info:
-            info('Got task from broker: %s', req)
+            info('Received task: %s', req)
 
         if events:
             send_event(

+ 2 - 2
docs/history/changelog-1.0.rst

@@ -1283,8 +1283,8 @@ News
 
 * Log message `Unknown task ignored...` now has log level `ERROR`
 
-* Log message `"Got task from broker"` is now emitted for all tasks, even if
-    the task has an ETA (estimated time of arrival). Also the message now
+* Log message when task is received is now emitted for all tasks, even if
+    the task has an ETA (estimated time of arrival). Also the log message now
     includes the ETA for the task (if any).
 
 * Acknowledgement now happens in the pool callback. Can't do ack in the job

+ 1 - 1
docs/history/changelog-2.2.rst

@@ -648,7 +648,7 @@ Important Notes
     When the worker encounters your breakpoint it will log the following
     information::
 
-        [INFO/MainProcess] Got task from broker:
+        [INFO/MainProcess] Received task:
             tasks.add[d7261c71-4962-47e5-b342-2448bedd20e8]
         [WARNING/PoolWorker-1] Remote Debugger:6900:
             Please telnet 127.0.0.1 6900.  Type `exit` in session to continue.

+ 1 - 1
docs/tutorials/debugging.rst

@@ -42,7 +42,7 @@ variable :envvar:`CELERY_RDB_HOST`.
 When the worker encounters your breakpoint it will log the following
 information::
 
-    [INFO/MainProcess] Got task from broker:
+    [INFO/MainProcess] Received task:
         tasks.add[d7261c71-4962-47e5-b342-2448bedd20e8]
     [WARNING/PoolWorker-1] Remote Debugger:6900:
         Please telnet 127.0.0.1 6900.  Type `exit` in session to continue.

+ 3 - 3
extra/logtools/find-unprocessed-tasks.sh

@@ -22,7 +22,7 @@ export CELERYD_LOGFILE=${1:-$DEFAULT_LOGFILE}
 
 get_start_date_by_task_id() {
     task_id="$1"
-    grep 'Got task from broker:' $CELERYD_LOGFILE | \
+    grep 'Received task:' $CELERYD_LOGFILE | \
         grep "$task_id" | \
         perl -nle'
             /^\[(.+?): INFO/; print $1' | \
@@ -41,8 +41,8 @@ get_end_date_by_task_id() {
 
 
 get_all_task_ids() {
- grep 'Got task from broker:' $CELERYD_LOGFILE | \
-	perl -nle'/Got task from broker:.+?\[(.+?)\]/; print($1)'
+ grep 'Received task:' $CELERYD_LOGFILE | \
+	perl -nle'/Received task:.+?\[(.+?)\]/; print($1)'
 }
 
 

+ 2 - 2
extra/logtools/periodic-task-runtimes.sh

@@ -36,9 +36,9 @@ get_received_date_for_task () {
     host="$1"
     ssh "$USER@$host" "
         grep '$query' $CELERYD_LOGFILE | \
-            grep 'Got task from broker:' | \
+            grep 'Received task:' | \
             perl -nle'
-                /^\[(.+?): INFO.+?Got task from broker:(.+?)\s*/;
+                /^\[(.+?): INFO.+?Received task:(.+?)\s*/;
                 print \"[\$1] $host \$2\"' | \
             sed 's/\s*$//'
     "