Fix modMucMamFlushed metric

esl · Feb 5, 2021 · af7469e · af7469e
1 parent c7935ad
commit af7469e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/big_tests/tests/mam_SUITE.erl b/big_tests/tests/mam_SUITE.erl
@@ -933,7 +933,15 @@ init_per_testcase(C=muc_querying_for_all_messages_with_jid, Config) ->
         muc_bootstrap_archive(start_alice_room(Config1)));
 init_per_testcase(C=muc_archive_request, Config) ->
     Config1 = escalus_fresh:create_users(Config, [{alice, 1}, {bob, 1}]),
-    escalus:init_per_testcase(C, start_alice_room(Config1));
+    Config2 = %% Check that metric is incremented on MUC flushed
+        case ?config(configuration, Config1) of
+            rdbms_async_pool ->
+                MongooseMetrics = [{['_', 'modMucMamFlushed'], changed}],
+                [{mongoose_metrics, MongooseMetrics} | Config1];
+            _ ->
+                Config1
+        end,
+    escalus:init_per_testcase(C, start_alice_room(Config2));
 init_per_testcase(C=muc_no_elements, Config) ->
     rpc_apply(gen_mod, set_module_opts, [host(), mod_mam_muc, [no_stanzaid_element]]),
     Config1 = escalus_fresh:create_users(Config, [{alice, 1}, {bob, 1}]),

diff --git a/src/metrics/mongoose_metrics_definitions.hrl b/src/metrics/mongoose_metrics_definitions.hrl
@@ -53,6 +53,7 @@
     modMucMamLookups,
     modMucMamForwarded,
     modMucMamArchived,
+    modMucMamFlushed,
     modMucMamSinglePurges,
     modMucMamMultiplePurges,
     modCSIInactive,

diff --git a/src/metrics/mongoose_metrics_mam_hooks.erl b/src/metrics/mongoose_metrics_mam_hooks.erl
@@ -46,7 +46,8 @@ get_hooks(Host) ->
      [mam_muc_get_prefs, Host, ?MODULE, mam_muc_get_prefs, 50],
      [mam_muc_archive_message, Host, ?MODULE, mam_muc_archive_message, 50],
      [mam_muc_remove_archive, Host, ?MODULE, mam_muc_remove_archive, 50],
-     [mam_muc_lookup_messages, Host, ?MODULE, mam_muc_lookup_messages, 100]
+     [mam_muc_lookup_messages, Host, ?MODULE, mam_muc_lookup_messages, 100],
+     [mam_muc_flush_messages, Host, ?MODULE, mam_muc_flush_messages, 50]
     ].
 
 -spec mam_get_prefs(Result :: any(),