Mercurial > prosody-hg

diff core/rostermanager.lua @ 282:80e7de32b618

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging my new SASL code with Waqas' adjusted saslauth module.
author Tobias Markmann <tm@ayena.de>
date Sat, 15 Nov 2008 13:47:17 +0100
parents fd0607c8f179
children cccd610a0ef9
line wrap: on
line diff
--- a/core/rostermanager.lua	Wed Nov 12 21:38:46 2008 +0100
+++ b/core/rostermanager.lua	Sat Nov 15 13:47:17 2008 +0100
@@ -1,8 +1,6 @@
 
-local mainlog = log;
-local function log(type, message)
-	mainlog(type, "rostermanager", message);
-end
+
+local log = require "util.logger".init("rostermanager");
 
 local setmetatable = setmetatable;
 local format = string.format;
@@ -234,7 +232,7 @@
 		if item.subscription == "from" then
 			item.subscription = "none";
 			changed = true;
-		elseif item.subscription == both then
+		elseif item.subscription == "both" then
 			item.subscription = "to";
 			changed = true;
 		end