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

Diff

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
line wrap: on
line diff
--- a/core/sessionmanager.lua	Sat Mar 23 02:24:11 2013 +0100
+++ b/core/sessionmanager.lua	Sat Mar 23 02:33:15 2013 +0100
@@ -140,7 +140,7 @@
 		local sessions = hosts[session.host].sessions[session.username].sessions;
 		if sessions[resource] then
 			-- Resource conflict
-			local policy = config_get(session.host, "core", "conflict_resolve");
+			local policy = config_get(session.host, "conflict_resolve");
 			local increment;
 			if policy == "random" then
 				resource = uuid_generate();