Page MenuHomeSoftware Heritage
Differential D967

Add debug logging in the SWHTask class
ClosedPublic
Actions

Authored by douardda on Jan 17 2019, 11:28 AM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T1479: Factorize the debug logging of a task in the SWHTask class
Commits
rDSCHdf1cca3266cc: Add debug logging in the SWHTask class
Summary

instead of replicating the same logging code everywhere.

Related to T1479

Diff Detail

Repository
rDSCH Scheduling utilities
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathSize
swh/
scheduler/
6 lines
tests/
24 lines

Diff 3078

View Options

swh/scheduler/task.py

Show All 24 Lines def on_success(self, retval, task_id, args, kwargs):
self.send_event('task-result', result=retval) self.send_event('task-result', result=retval)
@property @property
def log(self): def log(self):
if self._log is None: if self._log is None:
self._log = get_task_logger(self.name) self._log = get_task_logger(self.name)
return self._log return self._log
def run(self, *args, **kwargs):
self.log.debug('%s: args=%s, kwargs=%s', self.name, args, kwargs)
ret = super().run(*args, **kwargs)
self.log.debug('%s: OK => %s', self.name, ret)
return ret
class Task(SWHTask): class Task(SWHTask):
"""a schedulable task (abstract class) """a schedulable task (abstract class)
DEPRECATED! Please use SWHTask as base for decorated functions instead. DEPRECATED! Please use SWHTask as base for decorated functions instead.
Sub-classes must implement the run_task() method. Sub-classes must implement the run_task() method.
Show All 22 Lines
View Options

swh/scheduler/tests/tasks.py

from celery import group from celery import group, current_app as app
from swh.scheduler.celery_backend.config import app
@app.task(name='swh.scheduler.tests.tasks.ping', bind=True)
@app.task(name='swh.scheduler.tests.tasks.ping',
bind=True)
def ping(self, **kw): def ping(self, **kw):
# check this is a SWHTask # check this is a SWHTask
assert hasattr(self, 'log') assert hasattr(self, 'log')
assert not hasattr(self, 'run_task') assert not hasattr(self, 'run_task')
assert 'SWHTask' in [x.__name__ for x in self.__class__.__mro__] assert 'SWHTask' in [x.__name__ for x in self.__class__.__mro__]
self.log.debug(self.name) self.log.debug(self.name)
if kw: if kw:
return 'OK (kw=%s)' % kw return 'OK (kw=%s)' % kw
return 'OK' return 'OK'
@app.task(name='swh.scheduler.tests.tasks.multiping', @app.task(name='swh.scheduler.tests.tasks.multiping', bind=True)
bind=True)
def multiping(self, n=10): def multiping(self, n=10):
self.log.debug(self.name)
promise = group(ping.s(i=i) for i in range(n))() promise = group(ping.s(i=i) for i in range(n))()
self.log.debug('%s OK (spawned %s subtasks)' % (self.name, n)) self.log.debug('%s OK (spawned %s subtasks)' % (self.name, n))
promise.save() promise.save()
return promise.id return promise.id
@app.task(name='swh.scheduler.tests.tasks.error', @app.task(name='swh.scheduler.tests.tasks.error')
bind=True) def not_implemented():
def not_implemented(self):
self.log.debug(self.name)
raise NotImplementedError('Nope') raise NotImplementedError('Nope')
@app.task(name='swh.scheduler.tests.tasks.add', @app.task(name='swh.scheduler.tests.tasks.add')
bind=True) def add(x, y):
def add(self, x, y):
self.log.debug(self.name)
return x + y return x + y
About · Developer information · Legal