diff --git a/inventory_provider/tasks/common.py b/inventory_provider/tasks/common.py index 1e201938e98f9877615ea793462212df85967115..3125c81071c826a9bd8e2e03c81817d3fb730041 100644 --- a/inventory_provider/tasks/common.py +++ b/inventory_provider/tasks/common.py @@ -36,7 +36,8 @@ TASK_LOG_SCHEMA = { 'worker': {'type': ['string', 'null']}, 'pid': {'type': 'integer'}, 'warning': {'type': 'boolean'}, - 'error': {'type': 'boolean'} + 'error': {'type': 'boolean'}, + 'args': {'type': 'array'} }, 'required': ['task', 'id', 'worker', 'pid', 'warning', 'error'], 'additionalProperties': False diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py index 56ec176cc62ce5f541ccc61713a5117b88445156..591875038d6d2d35ebb4ddf6f319f6dc8afbd99c 100644 --- a/inventory_provider/tasks/worker.py +++ b/inventory_provider/tasks/worker.py @@ -106,17 +106,17 @@ class InventoryTask(Task): self._append_to_log('ERROR', str(exc)) save_task_log( InventoryTask.config, - {'messages': self.messages, 'meta': self._meta()}) + {'messages': self.messages, 'meta': self._meta(args=args)}) super().on_failure(exc, task_id, args, kwargs, einfo) def on_success(self, retval, task_id, args, kwargs): self._append_to_log('INFO', 'DONE') save_task_log( InventoryTask.config, - {'messages': self.messages, 'meta': self._meta()}) + {'messages': self.messages, 'meta': self._meta(args=args)}) super().on_success(retval, task_id, args, kwargs) - def _meta(self, message = None): + def _meta(self, message=None, args=None): meta_struct = { 'task': self.name, 'id': self.request.id, @@ -127,6 +127,8 @@ class InventoryTask(Task): } if message: meta_struct['message'] = message + if args is not None: + meta_struct['args'] = args return meta_struct def return_value(self, message='OK'):