From b7141d986b4a379f8a9afd81e1219627204a39a4 Mon Sep 17 00:00:00 2001 From: f-kessler Date: Mon, 9 Oct 2017 20:59:03 +0200 Subject: [PATCH] fixed remove of old RICs and replacement of data for calling alarmHandler Changed for loop to iterate over a copy of multiList fixed replacement of data from xData --- includes/multicastAlarm.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/includes/multicastAlarm.py b/includes/multicastAlarm.py index 48c4209..40a8344 100644 --- a/includes/multicastAlarm.py +++ b/includes/multicastAlarm.py @@ -30,14 +30,15 @@ def newEntrymultiList(data): # multicastAlarm processing if enabled and delimiter RIC has been received if data['ric'] == globalVars.config.get("multicastAlarm", "multicastAlarm_delimiter_ric"): multiList = [] - logging.debug("multicastAlarm delimiter RIC received --> buffer cleared") + logging.debug("delimiter RIC received - buffer cleared") else: multiList.append([data, timestamp]) logging.debug("Added %s to multiList", data['ric']) # check for old entries in multiList - for (xData, xTimestamp) in multiList: - if xTimestamp > timestamp-globalVars.config.getint("multicastAlarm", "multicastAlarm_ignore_time"): + for (xData, xTimestamp) in multiList[:]: + if xTimestamp < timestamp-globalVars.config.getint("multicastAlarm", "multicastAlarm_ignore_time"): multiList.remove([xData, xTimestamp]) + logging.debug("RIC %s removed - %s sec. older than current timestamp", xData['ric'], xTimestamp-timestamp) def multicastAlarmExec(freq, data): @@ -50,9 +51,9 @@ def multicastAlarmExec(freq, data): for (xData, _) in multiList: #update data with values multiList data['ric'] = xData['ric'] - data['function'] = xData['ric'] - data['functionChar'] = xData['ric'] - data['description'] = xData['ric'] + data['function'] = xData['function'] + data['functionChar'] = xData['functionChar'] + data['description'] = xData['description'] logging.debug("data after update from multiList: %s", data) try: from includes import alarmHandler