aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/s2smanager.lua1
-rw-r--r--net/xmppserver_listener.lua6
2 files changed, 1 insertions, 6 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 0589e024..ab2e4a5c 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -126,6 +126,7 @@ function new_incoming(conn)
end
open_sessions = open_sessions + 1;
local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$"));
+ session.log = log;
session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end
incoming_s2s[session] = true;
return session;
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index 1f27d841..6a196446 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -114,12 +114,6 @@ function xmppserver.listener(conn, data)
session = s2s_new_incoming(conn);
sessions[conn] = session;
- -- Logging functions --
-
-
- local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$");
- session.log = logger.init(conn_name);
-
session.log("info", "Incoming s2s connection");
session.reset_stream = session_reset_stream;