From 4ef0dd6997fcc1ab924891991ab2ae96b1fac316 Mon Sep 17 00:00:00 2001
From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Tue, 15 Jul 2014 20:26:32 +0400
Subject: [PATCH] Better Riak usage detection
---
src/ejabberd_riak_sup.erl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/ejabberd_riak_sup.erl b/src/ejabberd_riak_sup.erl
index a066a3c8c..513ad785f 100644
--- a/src/ejabberd_riak_sup.erl
+++ b/src/ejabberd_riak_sup.erl
@@ -68,6 +68,9 @@ is_riak_configured(Host) ->
PortConfigured = ejabberd_config:get_option(
{riak_port, Host},
fun(_) -> true end, false),
+ AuthConfigured = lists:member(
+ ejabberd_auth_riak,
+ ejabberd_auth:auth_modules(Host)),
Modules = ejabberd_config:get_option(
{modules, Host},
fun(L) when is_list(L) -> L end, []),
@@ -75,7 +78,8 @@ is_riak_configured(Host) ->
fun({_Module, Opts}) ->
gen_mod:db_type(Opts) == riak
end, Modules),
- ServerConfigured or PortConfigured or ModuleWithRiakDBConfigured.
+ ServerConfigured or PortConfigured
+ or AuthConfigured or ModuleWithRiakDBConfigured.
do_start() ->
SupervisorName = ?MODULE,
--
2.40.0