From 5d88e92acc2ed7025151a9f34de93ef7019f5604 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sat, 5 Jun 2021 01:13:46 -0400 Subject: [PATCH] Avoid returning errors with duplicate router mode Like the previous (new) flush change, these shouldn't be errors, but simply information "what you want is already done" messages. --- daemon-common/node.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/daemon-common/node.py b/daemon-common/node.py index cb8dd2ba..1e019093 100644 --- a/daemon-common/node.py +++ b/daemon-common/node.py @@ -95,13 +95,13 @@ def secondary_node(zkhandler, node): # Get current state current_state = zkhandler.read('/nodes/{}/routerstate'.format(node)) - if current_state == 'primary': - retmsg = 'Setting node {} in secondary router mode.'.format(node) - zkhandler.write([ - ('/config/primary_node', 'none') - ]) - else: - return False, 'Node "{}" is already in secondary router mode.'.format(node) + if current_state == 'secondary': + return True, 'Node "{}" is already in secondary router mode.'.format(node) + + retmsg = 'Setting node {} in secondary router mode.'.format(node) + zkhandler.write([ + ('/config/primary_node', 'none') + ]) return True, retmsg @@ -123,13 +123,13 @@ def primary_node(zkhandler, node): # Get current state current_state = zkhandler.read('/nodes/{}/routerstate'.format(node)) - if current_state == 'secondary': - retmsg = 'Setting node {} in primary router mode.'.format(node) - zkhandler.write([ - ('/config/primary_node', node) - ]) - else: - return False, 'Node "{}" is already in primary router mode.'.format(node) + if current_state == 'primary': + return True, 'Node "{}" is already in primary router mode.'.format(node) + + retmsg = 'Setting node {} in primary router mode.'.format(node) + zkhandler.write([ + ('/config/primary_node', node) + ]) return True, retmsg