Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mrq/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ def save_abort(self):
"dateexpires": dateexpires
}

self._save_status("abort", updates)
self._save_status("abort", updates, exception=True)

def _save_status(self, status, updates=None, exception=False, w=None, j=None):

Expand Down
18 changes: 18 additions & 0 deletions tests/tasks/general.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,31 @@ def run(self, params):
raise Exception(params.get("message", ""))


class InAbortException(BaseException):
pass


class Abort(Task):

def run(self, params):

abort_current_job()


class AbortOnFailed(Task):
def run(self, params):

log.info("Will abort this task")

connections.mongodb_jobs.tests_inserts.insert(params)
try:
raise InAbortException
except InAbortException:
abort_current_job()

raise Exception("Should not be reached")


class ReturnParams(Task):

def run(self, params):
Expand Down
23 changes: 21 additions & 2 deletions tests/test_abort.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from mrq.job import Job
from mrq.queue import Queue
from datetime import datetime
from datetime import timedelta

from mrq.queue import Queue


def test_abort(worker):

Expand All @@ -19,3 +19,22 @@ def test_abort(worker):
assert job["status"] == "abort"
assert job.get("dateexpires") is not None
assert job["dateexpires"] < datetime.utcnow() + timedelta(hours=24)


def test_abort_traceback_history(worker):

worker.start(flags="--config tests/fixtures/config-tracebackhistory.py")

worker.send_task("tests.tasks.general.Abort", {"a": 41}, block=True, accept_statuses=["abort"])

job = worker.mongodb_jobs.mrq_jobs.find()[0]

assert len(job["traceback_history"]) == 1
assert not job["traceback_history"][0].get("original_traceback")

worker.send_task("tests.tasks.general.AbortOnFailed", {"a": 41}, block=True, accept_statuses=["abort"])

job = worker.mongodb_jobs.mrq_jobs.find({"path": "tests.tasks.general.AbortOnFailed"})[0]

assert len(job["traceback_history"]) == 1
assert "InAbortException" in job["traceback_history"][0].get("original_traceback")