Comparison

util.pubsub, pubsub.lib and tests: Add text to precondition-not-met error (fixes #1455)

comparison

equal deleted inserted replaced

-:cb9755d7a36e
+:0a2d7efca039
 local events = require "util.events";
 local cache = require "util.cache";
+local errors = require "util.error";
 local service_mt = {};
 local default_config = {
 	itemstore = function (config, _) return cache.new(config["max_items"]) end;
 	if not (node_config and required_config) then
 		return false;
 	end
 	for config_field, value in pairs(required_config) do
 		if node_config[config_field] ~= value then
-			return false;
+			return false, config_field;
 		end
 	end
 	return true;
 end
 			return ok, err;
 		end
 		node_obj = self.nodes[node];
 	elseif requested_config and not requested_config._defaults_only then
 		-- Check that node has the requested config before we publish
-		if not check_preconditions(node_obj.config, requested_config) then
+		local ok, field = check_preconditions(node_obj.config, requested_config);
-			return false, "precondition-not-met";
+		if not ok then
+			local err = errors.new({
+				type = "cancel", condition = "conflict", text = "Field does not match: "..field;
+			});
+			err.pubsub_condition = "precondition-not-met";
+			return false, err;
 		end
 	end
 	if not self.config.itemcheck(item) then
 		return nil, "invalid-item";
 	end