nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manman-sync node-id changes

Browse Source
This commit is contained in:
Maciej Krüger 2022-04-13 17:47:34 +02:00 committed by Alexander List
parent 6362e9cf94
commit deeef3dc55
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/gluon-config-mode-manman-sync/luasrc/lib/gluon/config-mode/wizard/0100-manman-sync.lua
View File

@ -31,6 +31,9 @@ return function(form, uci)
id.default = uci:get('gluon-manman-sync', 'sync', 'node') id.default = uci:get('gluon-manman-sync', 'sync', 'node')
id.datatype = 'maxlength(16)' id.datatype = 'maxlength(16)'
function id:write(data) 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) uci:set('gluon-manman-sync', 'sync', 'node', data)
end end

11
package/gluon-manman-sync/luasrc/usr/bin/manman-sync
View File

@ -152,13 +152,14 @@ if uci:get_bool('gluon-manman-sync', 'sync', 'enabled') then
end end
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 node
local should_hostname local should_hostname
if #location.nodes > 1 then if #location.nodes > 1 then
for _, potential_node in ipairs(location.nodes) do 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 node = potential_node
should_hostname = location.location.name .. '-' .. node.name should_hostname = location.location.name .. '-' .. node.name
end end
@ -166,10 +167,12 @@ if uci:get_bool('gluon-manman-sync', 'sync', 'enabled') then
else else
node = location.nodes[1] node = location.nodes[1]
should_hostname = location.location.name should_hostname = location.location.name
-- save node in csse this location gets more nodes
uci:set('gluon-manman-sync', 'sync', 'node', node.name)
end 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 if node == nil then
print('E: unable to find matching node (selector "' .. node .. '")') print('E: unable to find matching node (selector "' .. node .. '")')
return 2 return 2