Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make mod_offline_chatmarkers configurable #3609

Merged
merged 2 commits into from
Mar 29, 2022
Merged

Make mod_offline_chatmarkers configurable #3609

merged 2 commits into from
Mar 29, 2022

Conversation

arcusfelis
Copy link
Contributor

Proposed changes include:

  • Make mod_offline_chatmarkers configurable
  • Use maps for config options

@codecov
Copy link

codecov bot commented Mar 24, 2022 •
edited
Loading

Codecov Report

Merging #3609 (167478a) into master (dca553d) will decrease coverage by 0.01%.
The diff coverage is 80.00%.

@@            Coverage Diff             @@
##           master    #3609      +/-   ##
==========================================
- Coverage   80.92%   80.91%   -0.02%     
==========================================
  Files         425      425              
  Lines       32241    32239       -2     
==========================================
- Hits        26091    26085       -6     
- Misses       6150     6154       +4
Impacted Files Coverage Δ
src/config/mongoose_config_spec.erl 99.21% <ø> (ø)
src/offline/mod_offline_chatmarkers.erl 92.06% <75.00%> (+1.29%) ⬆️
src/config/mongoose_config_parser_toml.erl 99.23% <100.00%> (ø)
src/elasticsearch/mongoose_elasticsearch.erl 76.92% <0.00%> (-7.70%) ⬇️
src/cassandra/mongoose_cassandra.erl 77.77% <0.00%> (-3.71%) ⬇️
src/cassandra/mongoose_cassandra_worker.erl 65.72% <0.00%> (-2.82%) ⬇️
src/mam/mod_mam_elasticsearch_arch.erl 85.08% <0.00%> (-1.76%) ⬇️
src/logger/mongoose_log_filter.erl 78.08% <0.00%> (-1.37%) ⬇️
src/mod_roster.erl 78.52% <0.00%> (-0.24%) ⬇️
src/pubsub/mod_pubsub.erl 72.88% <0.00%> (-0.19%) ⬇️
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dca553d...167478a. Read the comment docs.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Mar 24, 2022 •
edited
Loading

small_tests_24 / small_tests / 0f2b272
Reports root / small

small_tests_23 / small_tests / 0f2b272
Reports root / small

dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 0f2b272
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 2

offline_SUITE:chatmarkers:init_per_group 
{'EXIT',
  {{badrpc,
     {'EXIT',
       {badarg,
         [{lists,keyfind,
            [backend,2,
             #{backend => rdbms,store_groupchat_messages => true}],
            []},
          {mod_offline_chatmarkers,add_default_backend,1,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,197}]},
          {mod_offline_chatmarkers,start,2,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,71}]},
          {gen_mod,start_module_for_host_type,3,
            [{file,"/home/circleci/project/src/gen_mod.erl"},
             {line,108}]},
          {mongoose_modules,start_module,4,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,95}]},
          {mongoose_modules,ensure_started,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,75}]},
          {mongoose_modules,'-replace_modules/3-lc$^1/1-1-',2,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,50}]},
          {mongoose_modules,replace_modules,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,51}]}]}}},
   [{distributed_helper,rpc,
      [#{node => mongooseim@localhost},
       mongoose_modules,replace_modules,
       [<<"test type">>,[],
      #{mod_muc_light =...

Report log

dynamic_domains_mysql_redis_24 / mysql_redis / 0f2b272
Reports root/ big
OK: 2819 / Failed: 1 / User-skipped: 150 / Auto-skipped: 2

muc_SUITE:hibernation:hibernated_room_can_be_queried_for_archive 
{error,{{assertion_failed,assert,is_groupchat_message,
              [<<"Restorable message">>],
              undefined,"undefined"},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {muc_SUITE,wait_for_mam_result,3,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4383}]},
     {muc_SUITE,'-hibernated_room_can_be_queried_for_archive/1-fun-0-',3,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4124}]},
     {escalus_story,story,4,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,72}]},
     {muc_SUITE,hibernated_room_can_be_queried_for_archive,1,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4120}]},
     {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1292}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1224}]}]}}

Report log

offline_SUITE:chatmarkers:init_per_group 
{'EXIT',
  {{badrpc,
     {'EXIT',
       {badarg,
         [{lists,keyfind,
            [backend,2,
             #{backend => rdbms,store_groupchat_messages => true}],
            [{error_info,#{module => erl_stdlib_errors}}]},
          {mod_offline_chatmarkers,add_default_backend,1,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,197}]},
          {mod_offline_chatmarkers,start,2,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,71}]},
          {gen_mod,start_module_for_host_type,3,
            [{file,"/home/circleci/project/src/gen_mod.erl"},
             {line,108}]},
          {mongoose_modules,start_module,4,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,95}]},
          {mongoose_modules,ensure_started,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,75}]},
          {mongoose_modules,'-replace_modules/3-lc$^1/1-1-',2,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,50}]},
          {mongoose_modules,replace_modules,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,51}]}]}}},
   [{distributed_helper,rpc,
      [#{node => mongooseim@localhost},
       mongoose_modules,replace_modules,
       [...

Report log

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 0f2b272
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 2

offline_SUITE:chatmarkers:init_per_group 
{'EXIT',
  {{badrpc,
     {'EXIT',
       {badarg,
         [{lists,keyfind,
            [backend,2,
             #{backend => rdbms,store_groupchat_messages => true}],
            [{error_info,#{module => erl_stdlib_errors}}]},
          {mod_offline_chatmarkers,add_default_backend,1,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,197}]},
          {mod_offline_chatmarkers,start,2,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,71}]},
          {gen_mod,start_module_for_host_type,3,
            [{file,"/home/circleci/project/src/gen_mod.erl"},
             {line,108}]},
          {mongoose_modules,start_module,4,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,95}]},
          {mongoose_modules,ensure_started,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,75}]},
          {mongoose_modules,'-replace_modules/3-lc$^1/1-1-',2,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,50}]},
          {mongoose_modules,replace_modules,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,51}]}]}}},
   [{distributed_helper,rpc,
      [#{node => mongooseim@localhost},
       mongoose_modules,replace_modules,
       [...

Report log

dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 0f2b272
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 2

offline_SUITE:chatmarkers:init_per_group 
{'EXIT',
  {{badrpc,
     {'EXIT',
       {badarg,
         [{lists,keyfind,
            [backend,2,
             #{backend => rdbms,store_groupchat_messages => true}],
            [{error_info,#{module => erl_stdlib_errors}}]},
          {mod_offline_chatmarkers,add_default_backend,1,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,197}]},
          {mod_offline_chatmarkers,start,2,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,71}]},
          {gen_mod,start_module_for_host_type,3,
            [{file,"/home/circleci/project/src/gen_mod.erl"},
             {line,108}]},
          {mongoose_modules,start_module,4,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,95}]},
          {mongoose_modules,ensure_started,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,75}]},
          {mongoose_modules,'-replace_modules/3-lc$^1/1-1-',2,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,50}]},
          {mongoose_modules,replace_modules,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,51}]}]}}},
   [{distributed_helper,rpc,
      [#{node => mongooseim@localhost},
       mongoose_modules,replace_modules,
       [...

Report log

ldap_mnesia_24 / ldap_mnesia / 0f2b272
Reports root/ big
OK: 1507 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / 0f2b272
Reports root/ big
OK: 1507 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0

internal_mnesia_24 / internal_mnesia / 0f2b272
Reports root/ big
OK: 1548 / Failed: 0 / User-skipped: 358 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / 0f2b272
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 2

offline_SUITE:chatmarkers:init_per_group 
{'EXIT',
  {{badrpc,
     {'EXIT',
       {badarg,
         [{lists,keyfind,
            [backend,2,
             #{backend => rdbms,store_groupchat_messages => true}],
            []},
          {mod_offline_chatmarkers,add_default_backend,1,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,197}]},
          {mod_offline_chatmarkers,start,2,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,71}]},
          {gen_mod,start_module_for_host_type,3,
            [{file,"/home/circleci/project/src/gen_mod.erl"},
             {line,108}]},
          {mongoose_modules,start_module,4,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,95}]},
          {mongoose_modules,ensure_started,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,75}]},
          {mongoose_modules,'-replace_modules/3-lc$^1/1-1-',2,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,50}]},
          {mongoose_modules,replace_modules,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,51}]}]}}},
   [{distributed_helper,rpc,
      [#{node => mongooseim@localhost},
       mongoose_modules,replace_modules,
       [<<"localhost">>,[],
      #{mod_muc_light =...

Report log

pgsql_mnesia_24 / pgsql_mnesia / 0f2b272
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 2

offline_SUITE:chatmarkers:init_per_group 
{'EXIT',
  {{badrpc,
     {'EXIT',
       {badarg,
         [{lists,keyfind,
            [backend,2,
             #{backend => rdbms,store_groupchat_messages => true}],
            [{error_info,#{module => erl_stdlib_errors}}]},
          {mod_offline_chatmarkers,add_default_backend,1,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,197}]},
          {mod_offline_chatmarkers,start,2,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,71}]},
          {gen_mod,start_module_for_host_type,3,
            [{file,"/home/circleci/project/src/gen_mod.erl"},
             {line,108}]},
          {mongoose_modules,start_module,4,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,95}]},
          {mongoose_modules,ensure_started,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,75}]},
          {mongoose_modules,'-replace_modules/3-lc$^1/1-1-',2,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,50}]},
          {mongoose_modules,replace_modules,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,51}]}]}}},
   [{distributed_helper,rpc,
      [#{node => mongooseim@localhost},
       mongoose_modules,replace_modules,
       [...

Report log

mysql_redis_24 / mysql_redis / 0f2b272
Reports root/ big
OK: 3193 / Failed: 0 / User-skipped: 147 / Auto-skipped: 2

offline_SUITE:chatmarkers:init_per_group 
{'EXIT',
  {{badrpc,
     {'EXIT',
       {badarg,
         [{lists,keyfind,
            [backend,2,
             #{backend => rdbms,store_groupchat_messages => true}],
            [{error_info,#{module => erl_stdlib_errors}}]},
          {mod_offline_chatmarkers,add_default_backend,1,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,197}]},
          {mod_offline_chatmarkers,start,2,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,71}]},
          {gen_mod,start_module_for_host_type,3,
            [{file,"/home/circleci/project/src/gen_mod.erl"},
             {line,108}]},
          {mongoose_modules,start_module,4,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,95}]},
          {mongoose_modules,ensure_started,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,75}]},
          {mongoose_modules,'-replace_modules/3-lc$^1/1-1-',2,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,50}]},
          {mongoose_modules,replace_modules,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,51}]}]}}},
   [{distributed_helper,rpc,
      [#{node => mongooseim@localhost},
       mongoose_modules,replace_modules,
       [...

Report log

elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 0f2b272
Reports root/ big
OK: 1855 / Failed: 0 / User-skipped: 366 / Auto-skipped: 0

mssql_mnesia_24 / odbc_mssql_mnesia / 0f2b272
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 2

offline_SUITE:chatmarkers:init_per_group 
{'EXIT',
  {{badrpc,
     {'EXIT',
       {badarg,
         [{lists,keyfind,
            [backend,2,
             #{backend => rdbms,store_groupchat_messages => true}],
            [{error_info,#{module => erl_stdlib_errors}}]},
          {mod_offline_chatmarkers,add_default_backend,1,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,197}]},
          {mod_offline_chatmarkers,start,2,
            [{file,
               "/home/circleci/project/src/offline/mod_offline_chatmarkers.erl"},
             {line,71}]},
          {gen_mod,start_module_for_host_type,3,
            [{file,"/home/circleci/project/src/gen_mod.erl"},
             {line,108}]},
          {mongoose_modules,start_module,4,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,95}]},
          {mongoose_modules,ensure_started,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,75}]},
          {mongoose_modules,'-replace_modules/3-lc$^1/1-1-',2,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,50}]},
          {mongoose_modules,replace_modules,3,
            [{file,
               "/home/circleci/project/src/mongoose_modules.erl"},
             {line,51}]}]}}},
   [{distributed_helper,rpc,
      [#{node => mongooseim@localhost},
       mongoose_modules,replace_modules,
       [...

Report log

riak_mnesia_24 / riak_mnesia / 0f2b272
Reports root/ big
OK: 1698 / Failed: 0 / User-skipped: 365 / Auto-skipped: 0

@mongoose-im mongoose-im mentioned this pull request Mar 24, 2022
Closed
chrzaszcz
chrzaszcz approved these changes Mar 25, 2022
View reviewed changes
Copy link
Member

@chrzaszcz chrzaszcz left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I just missed the failing tests, please fix these.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Mar 29, 2022 •
edited
Loading

small_tests_24 / small_tests / 167478a
Reports root / small

small_tests_23 / small_tests / 167478a
Reports root / small

dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 167478a
Reports root/ big
OK: 2826 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 167478a
Reports root/ big
OK: 2826 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_mysql_redis_24 / mysql_redis / 167478a
Reports root/ big
OK: 2809 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 167478a
Reports root/ big
OK: 2826 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / 167478a
Reports root/ big
OK: 1507 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / 167478a
Reports root/ big
OK: 1507 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0

internal_mnesia_24 / internal_mnesia / 167478a
Reports root/ big
OK: 1548 / Failed: 0 / User-skipped: 358 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 167478a
Reports root/ big
OK: 3200 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

mysql_redis_24 / mysql_redis / 167478a
Reports root/ big
OK: 3195 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / 167478a
Reports root/ big
OK: 3200 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 167478a
Reports root/ big
OK: 1855 / Failed: 0 / User-skipped: 366 / Auto-skipped: 0

mssql_mnesia_24 / odbc_mssql_mnesia / 167478a
Reports root/ big
OK: 3200 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / 167478a
Reports root/ big
OK: 1698 / Failed: 0 / User-skipped: 365 / Auto-skipped: 0

@chrzaszcz chrzaszcz merged commit d091458 into master Mar 29, 2022
@chrzaszcz chrzaszcz deleted the mu-config-mod_offline_chatmarkers branch March 29, 2022 13:08
@Premwoik Premwoik added this to the 5.1.0 milestone May 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrzaszcz chrzaszcz chrzaszcz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
5.1.0
Development

Successfully merging this pull request may close these issues.
4 participants
@arcusfelis @mongoose-im @chrzaszcz @Premwoik