# HG changeset patch # User Matthew Wild # Date 1389526075 18000 # Node ID 5718c6d15d3433b9da8404958f63e2da8d9744cc # Parent 905b4fd863b42c15866c0102096c195d0540c546# Parent 787df113096530ebec3da817d3268b3276e57c07 Merge 0.10->trunk diff -r 905b4fd863b4 -r 5718c6d15d34 .hgtags --- a/.hgtags Tue Dec 31 19:09:34 2013 +0100 +++ b/.hgtags Sun Jan 12 06:27:55 2014 -0500 @@ -50,3 +50,4 @@ 49e3c49eb0d8f33e94e2bf37e5421deacac5f499 0.9.2 49e3c49eb0d8f33e94e2bf37e5421deacac5f499 0.9.2 56b1f151f4a31fcc7dbde49e064a288715077ece 0.9.2 +872ff4851c9b6cd662aac4b1a056ac2a97c85ce5 0.9.3 diff -r 905b4fd863b4 -r 5718c6d15d34 plugins/mod_s2s/mod_s2s.lua --- a/plugins/mod_s2s/mod_s2s.lua Tue Dec 31 19:09:34 2013 +0100 +++ b/plugins/mod_s2s/mod_s2s.lua Sun Jan 12 06:27:55 2014 -0500 @@ -366,7 +366,7 @@ if to then hosts[to].events.fire_event("s2s-stream-features", { origin = session, features = features }); else - (session.log or log)("warn", "No 'to' on stream header from %s means we can't offer any features", from or "unknown host"); + (session.log or log)("warn", "No 'to' on stream header from %s means we can't offer any features", from or session.ip or "unknown host"); end log("debug", "Sending stream features: %s", tostring(features)); @@ -467,7 +467,7 @@ end if reason then -- nil == no err, initiated by us, false == initiated by remote if type(reason) == "string" then -- assume stream error - log("debug", "Disconnecting %s[%s], is: %s", session.host or "(unknown host)", session.type, reason); + log("debug", "Disconnecting %s[%s], is: %s", session.host or session.ip or "(unknown host)", session.type, reason); session.sends2s(st.stanza("stream:error"):tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' })); elseif type(reason) == "table" then if reason.condition then @@ -478,7 +478,7 @@ if reason.extra then stanza:add_child(reason.extra); end - log("debug", "Disconnecting %s[%s], is: %s", session.host or "(unknown host)", session.type, tostring(stanza)); + log("debug", "Disconnecting %s[%s], is: %s", session.host or session.ip or "(unknown host)", session.type, tostring(stanza)); session.sends2s(stanza); elseif reason.name then -- a stanza log("debug", "Disconnecting %s->%s[%s], is: %s", session.from_host or "(unknown host)", session.to_host or "(unknown host)", session.type, tostring(reason)); @@ -660,7 +660,7 @@ end if must_secure and (session.cert_chain_status ~= "valid" or session.cert_identity_status ~= "valid") then - module:log("warn", "Forbidding insecure connection to/from %s", host); + module:log("warn", "Forbidding insecure connection to/from %s", host or session.ip or "(unknown host)"); if session.direction == "incoming" then session:close({ condition = "not-authorized", text = "Your server's certificate is invalid, expired, or not trusted by "..session.to_host }); else -- Close outgoing connections without warning diff -r 905b4fd863b4 -r 5718c6d15d34 plugins/mod_storage_sql2.lua --- a/plugins/mod_storage_sql2.lua Tue Dec 31 19:09:34 2013 +0100 +++ b/plugins/mod_storage_sql2.lua Sun Jan 12 06:27:55 2014 -0500 @@ -263,12 +263,12 @@ local args_len = #args -- Before or after specific item, exclusive if query.after then -- keys better be unique! - where[#where+1] = "`sort_id` > (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ?`AND user` = ?`AND store` = ? LIMIT 1)" + where[#where+1] = "`sort_id` > (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ?` AND user` = ?` AND store` = ? LIMIT 1)" args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.after, args[1], args[2], args[3]; args_len = args_len + 4 end if query.before then - where[#where+1] = "`sort_id` < (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ?`AND user` = ?`AND store` = ? LIMIT 1)" + where[#where+1] = "`sort_id` < (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ?` AND user` = ?` AND store` = ? LIMIT 1)" args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.before, args[1], args[2], args[3]; end end diff -r 905b4fd863b4 -r 5718c6d15d34 plugins/mod_tls.lua diff -r 905b4fd863b4 -r 5718c6d15d34 tools/migration/migrator/prosody_files.lua --- a/tools/migration/migrator/prosody_files.lua Tue Dec 31 19:09:34 2013 +0100 +++ b/tools/migration/migrator/prosody_files.lua Sun Jan 12 06:27:55 2014 -0500 @@ -13,6 +13,7 @@ local pairs = pairs; local json = require "util.json"; local os_getenv = os.getenv; +local error = error; prosody = {}; local dm = require "util.datamanager" @@ -95,15 +96,18 @@ local iter = mtools.sorted { reader = function() local x = iter(); - if x then + while x do dm.set_data_path(path); local err; x.data, err = dm.load(x.user, x.host, x.store); if x.data == nil and err then - error(("Error loading data at path %s for %s@%s (%s store)") - :format(path, x.user or "", x.host or "", x.store or ""), 0); + local p = dm.getpath(x.user, x.host, x.store); + print(("Error loading data at path %s for %s@%s (%s store): %s") + :format(p, x.user or "", x.host or "", x.store or "", err or "")); + else + return x; end - return x; + x = iter(); end end; sorter = function(a, b)