Ask Solem 10 rokov pred
rodič
commit
5ba2e75e73

+ 1 - 1
celery/events/state.py

@@ -163,7 +163,7 @@ class Worker(object):
                 if not local_received or not timestamp:
                     return
                 drift = abs(int(local_received) - int(timestamp))
-                if drift > HEARTBEAT_DRIFT_MAX:
+                if drift > max_drift:
                     _warn_drift(self.hostname, drift,
                                 local_received, timestamp)
                 if local_received:

+ 3 - 3
celery/tests/events/test_state.py

@@ -324,9 +324,9 @@ class test_State(AppCase):
         tA, tB, tC = r.uids
         r.play()
         now = list(state.tasks_by_time(reverse=False))
-        self.assertEqual(now[0][0], tB)
-        self.assertEqual(now[1][0], tC)
-        self.assertEqual(now[2][0], tA)
+        self.assertEqual(now[0][0], tA)
+        self.assertEqual(now[1][0], tB)
+        self.assertEqual(now[2][0], tC)
         for _ in range(1000):
             shuffle(r.uids)
             tA, tB, tC = r.uids

+ 2 - 2
docs/conf.py

@@ -72,8 +72,8 @@ add_function_parentheses = True
 
 intersphinx_mapping = {
     'python': ('http://docs.python.org/dev', None),
-    'kombu': ('http://kombu.readthedocs.org/en/latest/', None),
-    'djcelery': ('http://django-celery.readthedocs.org/en/latest', None),
+    'kombu': ('http://kombu.readthedocs.org/en/master/', None),
+    'djcelery': ('http://django-celery.readthedocs.org/en/master', None),
     'cyme': ('http://cyme.readthedocs.org/en/latest', None),
     'amqp': ('http://amqp.readthedocs.org/en/latest', None),
     'flower': ('http://flower.readthedocs.org/en/latest', None),

+ 1 - 0
docs/configuration.rst

@@ -236,6 +236,7 @@ Can be one of the following:
 .. _`Redis`: http://redis.io
 .. _`Cassandra`: http://cassandra.apache.org/
 .. _`IronCache`: http://www.iron.io/cache
+.. _`CouchDB`: http://www.couchdb.com/
 .. _`Couchbase`: http://www.couchbase.com/
 
 

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

@@ -135,8 +135,8 @@ If you're looking for versions prior to 3.1.x you should go to :ref:`history`.
   before importing any task modules (Django 1.7 compatibility, Issue #2227) 
 
 - **Results**: ``result.get()`` was misbehaving by calling
- ``backend.get_task_meta`` in a finally call leading to
- AMQP result backend queues not being properly cleaned up (Issue #2245).
+  ``backend.get_task_meta`` in a finally call leading to
+  AMQP result backend queues not being properly cleaned up (Issue #2245).
 
 .. _version-3.1.14:
 

+ 1 - 1
docs/whatsnew-3.1.rst

@@ -76,7 +76,7 @@ so I cannot recommend them for production use.
 The next version of Celery 3.2 will focus on performance and removing
 rarely used parts of the library.  Work has also started on a new message
 protocol, supporting multiple languages and more.  The initial draft can
-be found :ref:`here <message-protocol-task-v2`.
+be found :ref:`here <message-protocol-task-v2>`.
 
 This has probably been the hardest release I've worked on, so no
 introduction to this changelog would be complete without a massive

+ 1 - 1
docs/whatsnew-3.2.rst

@@ -1,4 +1,4 @@
-.. _whatsnew-3.1:
+.. _whatsnew-3.2:
 
 ===========================================
  What's new in Celery 3.2 (TBA)