diff options
| author | Kim Alvefur <zash@zash.se> | 2017-10-29 02:05:19 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-10-29 02:05:19 +0200 |
| commit | 89526be11ca68bf639927c4ed1bc808bb769f5f5 (patch) | |
| tree | 0d8a66dad4d8c64d5cfab32c11132b2c0e1ca301 /core | |
| parent | 62eaaff226249e924494f78434c422bd094264c1 (diff) | |
| parent | 63e10c1c271e70eafc4257a54b07178488e33de1 (diff) | |
| download | prosody-89526be11ca68bf639927c4ed1bc808bb769f5f5.tar.gz prosody-89526be11ca68bf639927c4ed1bc808bb769f5f5.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/loggingmanager.lua | 2 | ||||
| -rw-r--r-- | core/rostermanager.lua | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index 6dc1c1d1..004f4c3b 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -178,7 +178,7 @@ local function log_to_file(sink_config, logfile) local timestamps = sink_config.timestamps; - if timestamps == true then + if timestamps == true or timestamps == nil then timestamps = default_timestamp; -- Default format elseif timestamps then timestamps = timestamps .. " "; diff --git a/core/rostermanager.lua b/core/rostermanager.lua index c94482c4..f6a44028 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -104,9 +104,9 @@ local function load_roster(username, host) if user then roster = user.roster; if roster then return roster; end - log("debug", "load_roster: loading for new user: %s@%s", username, host); + log("debug", "load_roster: loading for new user: %s", jid); else -- Attempt to load roster for non-loaded user - log("debug", "load_roster: loading for offline user: %s@%s", username, host); + log("debug", "load_roster: loading for offline user: %s", jid); end local roster_store = storagemanager.open(host, "roster", "keyval"); local data, err = roster_store:get(username); @@ -115,7 +115,10 @@ local function load_roster(username, host) roster_metadata(roster, err); if roster[jid] then roster[jid] = nil; - log("warn", "roster for %s has a self-contact", jid); + log("debug", "Roster for %s had a self-contact, removing", jid); + if not save_roster(username, host, roster, jid) then + log("warn", "Could not remove self-contact from roster for %s", jid); + end end if not err then hosts[host].events.fire_event("roster-load", { username = username, host = host, roster = roster }); |