Remove deprecated custom defaults from config_metrics

esl · Apr 7, 2022 · 840ee05 · 840ee05
1 parent 0e64090
commit 840ee05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/inbox/mod_inbox.erl b/src/inbox/mod_inbox.erl
@@ -562,9 +562,9 @@ hooks(HostType) ->
 get_groupchat_types(HostType) ->
     gen_mod:get_module_opt(HostType, ?MODULE, groupchat).
 
+-spec config_metrics(mongooseim:host_type()) -> [{gen_mod:opt_key(), gen_mod:opt_value()}].
 config_metrics(HostType) ->
-    OptsToReport = [{backend, rdbms}], %list of tuples {option, defualt_value}
-    mongoose_module_metrics:opts_for_module(HostType, ?MODULE, OptsToReport).
+    mongoose_module_metrics:opts_for_module(HostType, ?MODULE, [backend]).
 
 -spec muclight_enabled(HostType :: mongooseim:host_type()) -> boolean().
 muclight_enabled(HostType) ->

diff --git a/src/system_metrics/mongoose_module_metrics.erl b/src/system_metrics/mongoose_module_metrics.erl
@@ -8,7 +8,8 @@
 
 -optional_callbacks([config_metrics/1]).
 
--spec opts_for_module(mongooseim:host_type(), module(), list()) -> list().
+-spec opts_for_module(mongooseim:host_type(), module(), [gen_mod:opt_key()]) ->
+          [{gen_mod:opt_key(), gen_mod:opt_value()}].
 opts_for_module(HostType, Module, OptsToReport) ->
     try
         Opts = gen_mod:get_module_opts(HostType, Module),
@@ -17,8 +18,5 @@ opts_for_module(HostType, Module, OptsToReport) ->
         _:_ -> [{none, none}]
     end.
 
-get_opt({Opt, DefaultValue}, Opts) ->
-    % Deprecated, defaults should be specified in the config spec
-    {Opt, gen_mod:get_opt(Opt, Opts, DefaultValue)};
 get_opt(Opt, Opts) ->
     {Opt, gen_mod:get_opt(Opt, Opts)}.