From dcd5ebba7d00969b5673a49a5aaec56970508c27 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 1 Jul 2018 04:27:09 +0200 Subject: util.pubsub: Persist nodes on configuration change --- util/pubsub.lua | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'util') diff --git a/util/pubsub.lua b/util/pubsub.lua index 0bcae258..a24b04f2 100644 --- a/util/pubsub.lua +++ b/util/pubsub.lua @@ -487,13 +487,22 @@ function service:set_node_config(node, actor, new_config) return false, "item-not-found"; end - if new_config["persist_items"] ~= node_obj.config["persist_items"] then - self.data[node] = self.config.itemstore(self.nodes[node].config, node); - elseif new_config["max_items"] ~= node_obj.config["max_items"] then - self.data[node]:resize(new_config["max_items"]); + local old_config = node_obj.config; + node_obj.config = setmetatable(new_config, {__index=self.node_defaults}); + + if self.config.nodestore then + local ok, err = save_node_to_store(self, node_obj); + if not ok then + node_obj.config = old_config; + return ok, "internal-server-error"; + end end - node_obj.config = setmetatable(new_config, {__index=self.node_defaults}); + if old_config["persist_items"] ~= node_obj.config["persist_items"] then + self.data[node] = self.config.itemstore(self.nodes[node].config, node); + elseif old_config["max_items"] ~= node_obj.config["max_items"] then + self.data[node]:resize(self.nodes[node].config["max_items"]); + end return true; end -- cgit v1.2.3