From 28a13da118f65af89e2fc4ba66f1483414019501 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 1 Nov 2021 06:59:54 -0400 Subject: [PATCH] Fix non-noderange alert specification. The change in to accomodate nodarange without per-node distinct input claimed the single input data exclusively for multimode. Correct by pulling the singleton code to be common if the check breaks from the for loop. --- confluent_server/confluent/messages.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/confluent_server/confluent/messages.py b/confluent_server/confluent/messages.py index 21f8c1c0..148dc0e3 100644 --- a/confluent_server/confluent/messages.py +++ b/confluent_server/confluent/messages.py @@ -1471,18 +1471,18 @@ class InputAlertDestination(ConfluentMessage): self.valid_alert_params[key](inputdata[node][key]) else: return - for key in inputdata: - if key not in self.valid_alert_params: - raise exc.InvalidArgumentException( - 'Unrecognized alert parameter ' + key) - if isinstance(inputdata[key], dict): - inputdata[key] = self.valid_alert_params[key]( - inputdata[key]['value']) - else: - inputdata[key] = self.valid_alert_params[key]( - inputdata[key]) - for node in nodes: - self.alertcfg[node] = inputdata + for key in inputdata: + if key not in self.valid_alert_params: + raise exc.InvalidArgumentException( + 'Unrecognized alert parameter ' + key) + if isinstance(inputdata[key], dict): + inputdata[key] = self.valid_alert_params[key]( + inputdata[key]['value']) + else: + inputdata[key] = self.valid_alert_params[key]( + inputdata[key]) + for node in nodes: + self.alertcfg[node] = inputdata def alert_params_by_node(self, node): return self.alertcfg[node]