diff options
author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
---|---|---|
committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
commit | fd8e07af4789be362a61755ea47f216baeb64989 (patch) | |
tree | 0ac0a7a779fd27e79e940519441161dc0c4dfd5f /src/ejabberd_service.erl | |
parent | Log modules startup (diff) |
Get rid of ejabberd.hrl header
The header consisted of too many unrelated stuff and macros misuse.
Some stuff is moved into scram.hrl and type_compat.hrl.
All macros have been replaced with the corresponding function calls.
TODO: probably type_compat.hrl is not even needed anymore since
we support only Erlang >= OTP 17.5
Diffstat (limited to '')
-rw-r--r-- | src/ejabberd_service.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl index 4c3ae16a3..be417ff9c 100644 --- a/src/ejabberd_service.erl +++ b/src/ejabberd_service.erl @@ -36,7 +36,6 @@ %% API -export([send/2]). --include("ejabberd.hrl"). -include("xmpp.hrl"). -include("logger.hrl"). @@ -106,8 +105,8 @@ init([State, Opts]) -> State2 = xmpp_stream_in:set_timeout(State1, Timeout), State3 = State2#{access => Access, xmlns => ?NS_COMPONENT, - lang => ?MYLANG, - server => ?MYNAME, + lang => ejabberd_config:get_mylang(), + server => ejabberd_config:get_myname(), host_opts => dict:from_list(HostOpts1), stream_version => undefined, tls_options => TLSOpts, @@ -170,7 +169,7 @@ handle_auth_success(_, Mech, _, end, lists:foreach( fun(H) -> - ejabberd_router:register_route(H, ?MYNAME), + ejabberd_router:register_route(H, ejabberd_config:get_myname()), ejabberd_hooks:run(component_connected, [H]) end, Routes), State. |