Fixed a bug where task hash was different when a task had several parameters

Author: lcalem

mrq/scheduler.py

@@ -1,6 +1,7 @@
 from .context import log
 from .queue import send_task
 import datetime
+import json
 
 
 class Scheduler(object):
@@ -14,8 +15,14 @@ def refresh(self):
         self.all_tasks = list(self.collection.find())
 
     def hash_task(self, task):
-        return " ".join(
-            [str(task.get(x)) for x in ["path", "params", "interval", "dailytime", "queue"]])
+        params = task.get("params")
+        if params:
+          params = json.dumps(sorted(task["params"].items(), key=lambda x: x[0]))
+
+        full = [str(task.get(x)) for x in ["path", "interval", "dailytime", "queue"]]
+
+        print full.extend([str(params)])
+        return " ".join(full)
 
     def sync_tasks(self, tasks):
         """ Performs the first sync of a list of tasks, often defined in the config file. """

tests/fixtures/config-scheduler3.py

@@ -9,6 +9,15 @@
         },
         "dailytime": datetime.datetime.fromtimestamp(float(os.environ.get("MRQ_TEST_SCHEDULER_TIME"))).time()
     },
+    {
+        "path": "tests.tasks.general.MongoInsert",
+        "params": {
+          "a": 1,
+          "b": "test",
+          "c": 3.0
+        },
+        "dailytime": datetime.datetime.fromtimestamp(float(os.environ.get("MRQ_TEST_SCHEDULER_TIME"))).time()
+    }
 ]
 
 SCHEDULER_INTERVAL = 1

tests/test_scheduler.py

@@ -1,8 +1,5 @@
-from bson import ObjectId
-import urllib2
 import time
 import pytest
-import datetime
 
 
 # We want to test that launching the scheduler several times queues tasks
@@ -73,13 +70,13 @@ def test_scheduler_dailytime(worker, p_flags):
     assert collection.find().count() == 0
 
     # It should be done a first time immediately
-    time.sleep(2)
-    assert collection.find().count() == 1
+    time.sleep(3)
+    assert collection.find().count() == 2
 
     # Then a second time once the dailytime passes
     time.sleep(7)
-    assert collection.find().count() == 2
+    assert collection.find().count() == 4
 
     # Nothing more should happen today
     time.sleep(4)
-    assert collection.find().count() == 2
+    assert collection.find().count() == 4