prosody
898454038524
core/sessionmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/sessionmanager.lua @ 5377:898454038524

core.*: Complete removal of all traces of the "core" section and section-related code.
author Kim Alvefur <zash@zash.se>
date Sat, 23 Mar 2013 02:33:15 +0100
parent 5306:10bc0e2aa55e
child 5447:92b88476873a
comparison
equal deleted inserted replaced
5376:ba9be0be4bbb 5377:898454038524
138 bare_sessions[session.username..'@'..session.host] = sessions; 138 bare_sessions[session.username..'@'..session.host] = sessions;
139 else 139 else
140 local sessions = hosts[session.host].sessions[session.username].sessions; 140 local sessions = hosts[session.host].sessions[session.username].sessions;
141 if sessions[resource] then 141 if sessions[resource] then
142 -- Resource conflict 142 -- Resource conflict
143 local policy = config_get(session.host, "core", "conflict_resolve"); 143 local policy = config_get(session.host, "conflict_resolve");
144 local increment; 144 local increment;
145 if policy == "random" then 145 if policy == "random" then
146 resource = uuid_generate(); 146 resource = uuid_generate();
147 increment = true; 147 increment = true;
148 elseif policy == "increment" then 148 elseif policy == "increment" then