mod_s2s: Decide on log function once
authorKim Alvefur <zash@zash.se>
Thu, 22 May 2014 20:45:58 +0000 (22:45 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 22 May 2014 20:45:58 +0000 (22:45 +0200)
plugins/mod_s2s/mod_s2s.lua

index 263f24c0b55c2b633810521f89abdcb1cc159507..d35fc4891712f370fd9aff2cf8bb9e8a9e6dd41f 100644 (file)
@@ -529,6 +529,7 @@ end
 -- Session initialization logic shared by incoming and outgoing
 local function initialize_session(session)
        local stream = new_xmpp_stream(session, stream_callbacks);
+       local log = session.log or log;
        session.stream = stream;
 
        session.notopen = true;
@@ -546,8 +547,8 @@ local function initialize_session(session)
                if data then
                        local ok, err = stream:feed(data);
                        if ok then return; end
-                       (session.log or log)("warn", "Received invalid XML: %s", data);
-                       (session.log or log)("warn", "Problem was: %s", err);
+                       log("warn", "Received invalid XML: %s", data);
+                       log("warn", "Problem was: %s", err);
                        session:close("not-well-formed");
                end
        end