diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-02-19 03:31:15 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-02-19 03:31:15 +0000 |
| commit | e9b1ad76538bcbd601d23a750ad2ae828f26ec13 (patch) | |
| tree | 96bdd2ac6591be70b3eece031dfe86a9fe8aca0b /core | |
| parent | d8ecc06ff359005a10a309fb24c469ac0fd7a1c8 (diff) | |
| parent | 9c1222b34e89f8401a9749cf59c3e2a9bb07dd57 (diff) | |
| download | prosody-e9b1ad76538bcbd601d23a750ad2ae828f26ec13.tar.gz prosody-e9b1ad76538bcbd601d23a750ad2ae828f26ec13.zip | |
Merge with 0.7
Diffstat (limited to 'core')
| -rw-r--r-- | core/s2smanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 602d6837..875a6bdc 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -301,7 +301,7 @@ function try_connect(host_session, connect_host, connect_port) end function make_connect(host_session, connect_host, connect_port) - host_session.log("info", "Beginning new connection attempt to %s (%s:%d)", host_session.to_host, connect_host, connect_port); + (host_session.log or log)("info", "Beginning new connection attempt to %s (%s:%d)", host_session.to_host, connect_host, connect_port); -- Ok, we're going to try to connect local from_host, to_host = host_session.from_host, host_session.to_host; |