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_http_ws.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 'src/ejabberd_http_ws.erl')
-rw-r--r-- | src/ejabberd_http_ws.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl index b989f307..669041c6 100644 --- a/src/ejabberd_http_ws.erl +++ b/src/ejabberd_http_ws.erl @@ -37,7 +37,6 @@ monitor/1, reset_stream/1, close/1, change_shaper/2, socket_handoff/3, opt_type/1]). --include("ejabberd.hrl"). -include("logger.hrl"). -include("xmpp.hrl"). @@ -138,10 +137,10 @@ init([{#ws{ip = IP, http_opts = HOpts}, _} = WS]) -> end, HOpts), Opts = ejabberd_c2s_config:get_c2s_limits() ++ SOpts, PingInterval = ejabberd_config:get_option( - {websocket_ping_interval, ?MYNAME}, + {websocket_ping_interval, ejabberd_config:get_myname()}, ?PING_INTERVAL) * 1000, WSTimeout = ejabberd_config:get_option( - {websocket_timeout, ?MYNAME}, + {websocket_timeout, ejabberd_config:get_myname()}, ?WEBSOCKET_TIMEOUT) * 1000, Socket = {http_ws, self(), IP}, ?DEBUG("Client connected through websocket ~p", |