aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2009-11-22 21:55:58 +0500
committerWaqas Hussain <waqas20@gmail.com>2009-11-22 21:55:58 +0500
commit4c8e3f457d16e6246f851c3f71ad0d957713d616 (patch)
treeb605c894bb243376110c5b91607dc30c7ce47b61 /core
parent88f3737a7f70cfeac067fd9682a22bbd86872fff (diff)
parent889562f945cc57d19db944d6085fdfe5683dea5d (diff)
downloadprosody-4c8e3f457d16e6246f851c3f71ad0d957713d616.tar.gz
prosody-4c8e3f457d16e6246f851c3f71ad0d957713d616.zip
Merged with 0.6.
Diffstat (limited to 'core')
-rw-r--r--core/loggingmanager.lua6
-rw-r--r--core/sessionmanager.lua34
2 files changed, 28 insertions, 12 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index c26fdc71..4154e1a7 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -17,6 +17,12 @@ local math_max, rep = math.max, string.rep;
local os_date, os_getenv = os.date, os.getenv;
local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
+if os.getenv("__FLUSH_LOG") then
+ local io_flush = io.flush;
+ local _io_write = io_write;
+ io_write = function(...) _io_write(...); io_flush(); end
+end
+
local config = require "core.configmanager";
local eventmanager = require "core.eventmanager";
local logger = require "util.logger";
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 7e609f22..380d8129 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -201,22 +201,32 @@ function streamclosed(session)
end
function send_to_available_resources(user, host, stanza)
+ local jid = user.."@"..host;
local count = 0;
- local to = stanza.attr.to;
- stanza.attr.to = nil;
- local h = hosts[host];
- if h and h.type == "local" then
- local u = h.sessions[user];
- if u then
- for k, session in pairs(u.sessions) do
- if session.presence then
- session.send(stanza);
- count = count + 1;
- end
+ local user = bare_sessions[jid];
+ if user then
+ for k, session in pairs(user.sessions) do
+ if session.presence then
+ session.send(stanza);
+ count = count + 1;
+ end
+ end
+ end
+ return count;
+end
+
+function send_to_interested_resources(user, host, stanza)
+ local jid = user.."@"..host;
+ local count = 0;
+ local user = bare_sessions[jid];
+ if user then
+ for k, session in pairs(user.sessions) do
+ if session.interested then
+ session.send(stanza);
+ count = count + 1;
end
end
end
- stanza.attr.to = to;
return count;
end