From 909262b4be85c18f685ecdb44722494cccc8cd30 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Fri, 8 May 2020 13:52:39 +0200
Subject: [PATCH] put task name in state meta in parent class
---
inventory_provider/tasks/worker.py | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index b82e263e..619ebdf1 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -67,8 +67,10 @@ class InventoryTask(Task):
logging.debug("loaded config: %r" % InventoryTask.config)
def update_state(self, **kwargs):
+ meta = kwargs.get('meta', dict())
+ meta['task'] = self.name
logger.debug(json.dumps(
- {'state': kwargs['state'], 'meta': str(kwargs['meta'])}
+ {'state': kwargs['state'], 'meta': str(meta)}
))
super().update_state(**kwargs)
@@ -271,7 +273,6 @@ def update_neteng_managed_device_list(self):
self.update_state(
state=states.STARTED,
meta={
- 'task': 'update_neteng_managed_device_list',
'message': 'querying netdash for managed routers'
})
@@ -281,7 +282,6 @@ def update_neteng_managed_device_list(self):
self.update_state(
state=states.STARTED,
meta={
- 'task': 'update_neteng_managed_device_list',
'message': f'found {len(routers)} routers, saving details'
})
@@ -425,7 +425,6 @@ def reload_router_config(self, hostname):
self.update_state(
state=states.STARTED,
meta={
- 'task': 'reload_router_config',
'hostname': hostname,
'message': 'loading router netconf data'
})
@@ -463,7 +462,6 @@ def reload_router_config(self, hostname):
self.update_state(
state=states.STARTED,
meta={
- 'task': 'reload_router_config',
'hostname': hostname,
'message': 'refreshing peers & clearing cache'
})
@@ -482,7 +480,6 @@ def reload_router_config(self, hostname):
self.update_state(
state=states.STARTED,
meta={
- 'task': 'reload_router_config',
'hostname': hostname,
'message': 'refreshing snmp interface indexes'
})
@@ -601,7 +598,6 @@ def refresh_finalizer(self, pending_task_ids_json):
self.update_state(
state=states.STARTED,
meta={
- 'task': 'refresh_finalizer',
'message': s
})
--
GitLab