From deeef3dc55e3c1f1b641991b36b30cdb960897fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 13 Apr 2022 17:47:34 +0200 Subject: [PATCH] manman-sync node-id changes --- .../lib/gluon/config-mode/wizard/0100-manman-sync.lua | 3 +++ package/gluon-manman-sync/luasrc/usr/bin/manman-sync | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/gluon-config-mode-manman-sync/luasrc/lib/gluon/config-mode/wizard/0100-manman-sync.lua b/package/gluon-config-mode-manman-sync/luasrc/lib/gluon/config-mode/wizard/0100-manman-sync.lua index 933304ad..6fe84420 100644 --- a/package/gluon-config-mode-manman-sync/luasrc/lib/gluon/config-mode/wizard/0100-manman-sync.lua +++ b/package/gluon-config-mode-manman-sync/luasrc/lib/gluon/config-mode/wizard/0100-manman-sync.lua @@ -31,6 +31,9 @@ return function(form, uci) id.default = uci:get('gluon-manman-sync', 'sync', 'node') id.datatype = 'maxlength(16)' function id:write(data) + -- so ID gets fetched from manman-sync again + uci:set('gluon-manman-sync', 'sync', 'node_id', nil) + uci:set('gluon-manman-sync', 'sync', 'node', data) end diff --git a/package/gluon-manman-sync/luasrc/usr/bin/manman-sync b/package/gluon-manman-sync/luasrc/usr/bin/manman-sync index bf346254..00389747 100755 --- a/package/gluon-manman-sync/luasrc/usr/bin/manman-sync +++ b/package/gluon-manman-sync/luasrc/usr/bin/manman-sync @@ -152,13 +152,14 @@ if uci:get_bool('gluon-manman-sync', 'sync', 'enabled') then end end - local local_node = uci:get('gluon-manman-sync', 'sync', 'node') or local_router_id + local local_node_name = uci:get('gluon-manman-sync', 'sync', 'node') or local_router_id + local local_node = uci:get('gluon-manman-sync', 'sync', 'node_id') or local_router_id local node local should_hostname if #location.nodes > 1 then for _, potential_node in ipairs(location.nodes) do - if potential_node.name == local_node then + if (local_node ~= nil and potential_node.name == local_node) or (local_node_name ~= nil and potential_node.name == local_node_name) then node = potential_node should_hostname = location.location.name .. '-' .. node.name end @@ -166,10 +167,12 @@ if uci:get_bool('gluon-manman-sync', 'sync', 'enabled') then else node = location.nodes[1] should_hostname = location.location.name - -- save node in csse this location gets more nodes - uci:set('gluon-manman-sync', 'sync', 'node', node.name) end + -- save node data to update name and persist ID + uci:set('gluon-manman-sync', 'sync', 'node_id', node.id) + uci:set('gluon-manman-sync', 'sync', 'node', node.name) + if node == nil then print('E: unable to find matching node (selector "' .. node .. '")') return 2