From 76788e975fda10a60ee41ed9eb0e5fae5b23241e Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Tue, 15 Mar 2016 10:48:09 +0000
Subject: [PATCH] Task #8887: improved publishing of task status change
notifications
---
SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py | 4 ++--
SAS/ResourceAssignment/ResourceAssigner/lib/config.py | 1 +
.../ResourceAssigner/lib/rapublisher.py | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py b/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
index e5ed166e652..5424725cd50 100755
--- a/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
+++ b/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
@@ -141,10 +141,10 @@ class ResourceAssigner():
if claimed:
self.radbrpc.updateTaskAndResourceClaims(taskId, claim_status='allocated')
self.radbrpc.updateTask(taskId, status='scheduled')
- self.raPublisher.notifyTaskSpecified(taskId, status='scheduled')
+ self.raPublisher.notifyTaskStatusChanged(taskId, momId, sasId, 'scheduled')
else:
self.radbrpc.updateTask(taskId, status='conflict')
- self.raPublisher.notifyTaskSpecified(taskId, status='conflict')
+ self.raPublisher.notifyTaskStatusChanged(taskId, momId, sasId, 'conflict')
try:
predecessor_ids = [int(id) for id in parsets.keys() if id != str(sasId)]
diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/config.py b/SAS/ResourceAssignment/ResourceAssigner/lib/config.py
index 357a9947e04..17aac73320d 100644
--- a/SAS/ResourceAssignment/ResourceAssigner/lib/config.py
+++ b/SAS/ResourceAssignment/ResourceAssigner/lib/config.py
@@ -6,6 +6,7 @@ DEFAULT_SERVICENAME = 'RAService'
RA_NOTIFICATION_BUSNAME='lofar.ra.notification'
RA_NOTIFICATION_PREFIX='RA.'
+RA_NOTIFICATION_SUBJECTS=RA_NOTIFICATION_PREFIX+'*'
try:
from lofar.sas.resourceassignment.rataskspecified.config import DEFAULT_NOTIFICATION_BUSNAME as RATASKSPECIFIED_NOTIFICATION_BUSNAME
diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/rapublisher.py b/SAS/ResourceAssignment/ResourceAssigner/lib/rapublisher.py
index 8bbad6dde9d..9beff8a237c 100644
--- a/SAS/ResourceAssignment/ResourceAssigner/lib/rapublisher.py
+++ b/SAS/ResourceAssignment/ResourceAssigner/lib/rapublisher.py
@@ -56,9 +56,9 @@ class RAPublisher():
def close(self):
self.tobus.close()
- def notifyTaskSpecified(self, taskId, status):
- content = { 'task_id' : taskId, 'status' : status }
- logger.info('notifyTaskSpecified: %s' % content)
- msg = EventMessage(context=self.notification_prefix + 'TaskSpecified', content=content)
+ def notifyTaskStatusChanged(self, taskId, momId, otdbId, status):
+ content = { 'task_id':taskId, 'status':status, 'mom_id':momId, 'otdb_id':otdbId }
+ logger.info('notifyTaskStatusChanged: %s' % content)
+ msg = EventMessage(context=self.notification_prefix + 'TaskStatusChanged', content=content)
self.tobus.send(msg)
--
GitLab