aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-05-22 05:53:27 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-05-22 05:53:27 +0500
commitc1257c7435697f4ed47c823ac0ebc8f676f1c773 (patch)
tree5eaaab170cf5a73c0c0187af40b28e5776a4fac5 /core
parentf77c1fc2d0378297e4d31ff2f7420515291d9988 (diff)
downloadprosody-c1257c7435697f4ed47c823ac0ebc8f676f1c773.tar.gz
prosody-c1257c7435697f4ed47c823ac0ebc8f676f1c773.zip
sessionmanager: Change error for reaching resource limit from 'conflict' to 'resource-constraint' during session bind.
Diffstat (limited to 'core')
-rw-r--r--core/sessionmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 3537d2d2..48990de3 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -136,7 +136,7 @@ function bind_resource(session, resource)
local sessions = hosts[session.host].sessions[session.username].sessions;
local limit = config_get(session.host, "core", "max_resources") or 10;
if #sessions >= limit then
- return nil, "cancel", "conflict", "Resource limit reached; only "..limit.." resources allowed";
+ return nil, "cancel", "resource-constraint", "Resource limit reached; only "..limit.." resources allowed";
end
if sessions[resource] then
-- Resource conflict