util.startup: Back out 598df17b8ebb
Broke signal handling again, such that an early s2s connection results
in libunbound catching signals and getting Prosody killed on e.g. SIGHUP
This returns to the situation where prosody --daemonize does not respond
to signals.
-- Prosody IM
-- Copyright (C) 2008-2010 Matthew Wild
-- Copyright (C) 2008-2010 Waqas Hussain
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
local st = require "prosody.util.stanza"
local private_storage = module:open_store("private", "map");
module:add_feature("jabber:iq:private");
module:hook("iq/self/jabber:iq:private:query", function(event)
local origin, stanza = event.origin, event.stanza;
local query = stanza.tags[1];
if #query.tags ~= 1 then
origin.send(st.error_reply(stanza, "modify", "bad-format"));
return true;
end
local tag = query.tags[1];
local key = tag.name..":"..tag.attr.xmlns;
if stanza.attr.type == "get" then
local data, err = private_storage:get(origin.username, key);
if data then
origin.send(st.reply(stanza):query("jabber:iq:private"):add_child(st.deserialize(data)));
elseif err then
origin.send(st.error_reply(stanza, "wait", "internal-server-error", err));
else
origin.send(st.reply(stanza):add_child(query));
end
return true;
else -- stanza.attr.type == "set"
local data;
if #tag ~= 0 then
data = st.preserialize(tag);
end
-- TODO delete datastore if empty
local ok, err = private_storage:set(origin.username, key, data);
if not ok then
origin.send(st.error_reply(stanza, "wait", "internal-server-error", err));
return true;
end
origin.send(st.reply(stanza));
return true;
end
end);