prosody
b40efef8ec99
util/pubsub.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

util/pubsub.lua @ 9144:b40efef8ec99

util.pubsub: Include node defaults from current service object
author Kim Alvefur <zash@zash.se>
date Tue, 07 Aug 2018 10:52:10 +0200
parent 9138:db47db788295
child 9158:37e814a680ab
line wrap: on
line diff
--- a/util/pubsub.lua	Mon Aug 06 23:20:47 2018 +0200
+++ b/util/pubsub.lua	Tue Aug 07 10:52:10 2018 +0200
@@ -633,6 +633,9 @@
 	for k, v in pairs(default_node_config) do
 		config_table[k] = v;
 	end
+	for k, v in pairs(self.node_defaults) do
+		config_table[k] = v;
+	end
 	for k, v in pairs(node_obj.config) do
 		config_table[k] = v;
 	end