aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd_app.erl
diff options
context:
space:
mode:
authorPaweł Chmielowski <pchmielowski@process-one.net>2016-09-08 16:29:19 +0200
committerPaweł Chmielowski <pchmielowski@process-one.net>2016-09-08 16:29:45 +0200
commit4bd45bada70fc233bb87bc7ab099fc2407cea30b (patch)
tree671e6aaa5b77a10c515e059be6398af5913ccc52 /src/ejabberd_app.erl
parentFull jid entity subscriptions should include bare jid records (#1284) (diff)
Start elixir config code only if elixir was enabled in configure script
Diffstat (limited to '')
-rw-r--r--src/ejabberd_app.erl13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
index 9d127e748..890ab6f90 100644
--- a/src/ejabberd_app.erl
+++ b/src/ejabberd_app.erl
@@ -255,7 +255,12 @@ register_elixir_config_hooks() ->
end.
start_elixir_application() ->
- case application:ensure_started(elixir) of
- ok -> ok;
- {error, _Msg} -> ?ERROR_MSG("Elixir application not started.", [])
- end.
+ case ejabberd_config:is_elixir_enabled() of
+ true ->
+ case application:ensure_started(elixir) of
+ ok -> ok;
+ {error, _Msg} -> ?ERROR_MSG("Elixir application not started.", [])
+ end;
+ _ ->
+ ok
+ end.