mirror of
https://github.com/bjc/prosody.git
synced 2025-04-03 05:07:42 +03:00
Merge 0.12->trunk
This commit is contained in:
commit
dd2e84271f
2 changed files with 6 additions and 0 deletions
|
@ -10,5 +10,7 @@ return {
|
|||
"loader";
|
||||
-- "keyval+" store
|
||||
"keyval+";
|
||||
|
||||
"s2sout-pre-connect-event";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -226,6 +226,10 @@ function route_to_new_session(event)
|
|||
resolver;
|
||||
});
|
||||
end
|
||||
|
||||
local pre_event = { session = host_session; resolver = resolver };
|
||||
module:context(from_host):fire_event("s2sout-pre-connect", pre_event);
|
||||
resolver = pre_event.resolver;
|
||||
connect(resolver, listener, nil, { session = host_session });
|
||||
m_initiated_connections:with_labels(from_host):add(1)
|
||||
return true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue