aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Chmielowski <pchmielowski@process-one.net>2020-05-15 13:43:56 +0200
committerPaweł Chmielowski <pchmielowski@process-one.net>2020-05-15 13:44:09 +0200
commit6f54b6ae3b8db4339c71172c3f81b3b666fbc7a1 (patch)
tree708f2359e910bf3727ce56385a16a20f80f1fc3e
parentDisplay installed ejabberd version in webadmin footer (#3272) (diff)
Don't crash in mod_muc_log:get_url when mod_muc_log is not enabled
Disco on room can call this function even when logger is not enabled, but this room option was enabled previously when logger was active.
-rw-r--r--src/mod_muc_log.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl
index c622d5591..4f76e864b 100644
--- a/src/mod_muc_log.erl
+++ b/src/mod_muc_log.erl
@@ -92,7 +92,7 @@ check_access_log(Host, From) ->
-spec get_url(#state{}) -> {ok, binary()} | error.
get_url(#state{room = Room, host = Host, server_host = ServerHost}) ->
- case mod_muc_log_opt:url(ServerHost) of
+ try mod_muc_log_opt:url(ServerHost) of
undefined -> error;
URL ->
case mod_muc_log_opt:dirname(ServerHost) of
@@ -101,6 +101,9 @@ get_url(#state{room = Room, host = Host, server_host = ServerHost}) ->
room_name ->
{ok, <<URL/binary, $/, Room/binary>>}
end
+ catch
+ error:{module_not_loaded, _, _} ->
+ error
end.
depends(_Host, _Opts) ->