diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-07-28 01:14:31 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-07-28 01:14:31 +0100 |
| commit | fbe75768718891167313bc0cbcffcd3a46042d31 (patch) | |
| tree | 2732225257e7b8ade28695dad7c0df3f7cea00b1 /core/rostermanager.lua | |
| parent | 8395775fc1bd1e72a8c83927003d2af1ed5f304a (diff) | |
| parent | f926338983c2f1dd0276d41e3c3d8e28cbef3d02 (diff) | |
| download | prosody-fbe75768718891167313bc0cbcffcd3a46042d31.tar.gz prosody-fbe75768718891167313bc0cbcffcd3a46042d31.zip | |
Merge with Florob
Diffstat (limited to 'core/rostermanager.lua')
| -rw-r--r-- | core/rostermanager.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua index 9d1ff5e2..ac4f4e3d 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -83,15 +83,15 @@ end function load_roster(username, host) local jid = username.."@"..host; - log("debug", "load_roster: asked for: "..jid); + log("debug", "load_roster: asked for: %s", jid); local user = bare_sessions[jid]; local roster; if user then roster = user.roster; if roster then return roster; end - log("debug", "load_roster: loading for new user: "..username.."@"..host); + log("debug", "load_roster: loading for new user: %s@%s", username, host); else -- Attempt to load roster for non-loaded user - log("debug", "load_roster: loading for offline user: "..username.."@"..host); + log("debug", "load_roster: loading for offline user: %s@%s", username, host); end local data, err = datamanager.load(username, host, "roster"); roster = data or {}; @@ -99,7 +99,7 @@ function load_roster(username, host) if not roster[false] then roster[false] = { broken = err or nil }; end if roster[jid] then roster[jid] = nil; - log("warn", "roster for "..jid.." has a self-contact"); + log("warn", "roster for %s has a self-contact", jid); end if not err then hosts[host].events.fire_event("roster-load", username, host, roster); @@ -108,7 +108,7 @@ function load_roster(username, host) end function save_roster(username, host, roster) - log("debug", "save_roster: saving roster for "..username.."@"..host); + log("debug", "save_roster: saving roster for %s@%s", username, host); if not roster then roster = hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster; --if not roster then @@ -238,7 +238,7 @@ function set_contact_pending_out(username, host, jid) -- subscribe roster[jid] = item; end item.ask = "subscribe"; - log("debug", "set_contact_pending_out: saving roster; set "..username.."@"..host..".roster["..jid.."].ask=subscribe"); + log("debug", "set_contact_pending_out: saving roster; set %s@%s.roster[%q].ask=subscribe", username, host, jid); return save_roster(username, host, roster); end function unsubscribe(username, host, jid) |