From c7605a69632f470332c275e26197e754448681c2 Mon Sep 17 00:00:00 2001
From: Robert Latta <robert.latta@geant.org>
Date: Fri, 16 Aug 2024 11:15:41 +0100
Subject: [PATCH] moved job log cache clearing from task to update route. RE
DBOARD3-1003
---
inventory_provider/routes/jobs.py | 1 +
inventory_provider/tasks/worker.py | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/inventory_provider/routes/jobs.py b/inventory_provider/routes/jobs.py
index 58cc45f6..8953a245 100644
--- a/inventory_provider/routes/jobs.py
+++ b/inventory_provider/routes/jobs.py
@@ -118,6 +118,7 @@ def update():
response='an update is already in progress',
status=503,
mimetype="text/html")
+ monitor.clear_joblog(r)
update_task_id = worker.update_entry_point.delay().get()
r.set('classifier-cache:update-task-id', update_task_id.encode('utf-8'))
return jsonify({'task id': update_task_id})
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index b457ce19..df5b9707 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -27,7 +27,6 @@ from inventory_provider.tasks.common \
import get_next_redis, get_current_redis, \
latch_db, get_latch, set_latch, update_latch_status, \
ims_sorted_service_type_key, set_single_latch
-from inventory_provider.tasks import monitor
from inventory_provider import config, nokia, gap
from inventory_provider import environment
from inventory_provider import snmp
@@ -462,7 +461,6 @@ def update_entry_point(self):
try:
_erase_next_db(InventoryTask.config)
update_latch_status(InventoryTask.config, pending=True)
- monitor.clear_joblog(get_current_redis(InventoryTask.config))
self.log_info("Starting update")
routers = retrieve_and_persist_neteng_managed_device_list(
--
GitLab