Mercurial > prosody-hg

comparison util/pubsub.lua @ 9144:b40efef8ec99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util.pubsub: Include node defaults from current service object
author Kim Alvefur <zash@zash.se>
date Tue, 07 Aug 2018 10:52:10 +0200
parents db47db788295
children 37e814a680ab
comparison
equal deleted inserted replaced
9143:817f666d9037 9144:b40efef8ec99
631 631
632 local config_table = {}; 632 local config_table = {};
633 for k, v in pairs(default_node_config) do 633 for k, v in pairs(default_node_config) do
634 config_table[k] = v; 634 config_table[k] = v;
635 end 635 end
636 for k, v in pairs(self.node_defaults) do
637 config_table[k] = v;
638 end
636 for k, v in pairs(node_obj.config) do 639 for k, v in pairs(node_obj.config) do
637 config_table[k] = v; 640 config_table[k] = v;
638 end 641 end
639 642
640 return true, config_table; 643 return true, config_table;