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.

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

Refactored hook handlers in mod_ping #3821

Merged
merged 2 commits into from
Oct 26, 2022
Merged

Refactored hook handlers in mod_ping #3821

merged 2 commits into from
Oct 26, 2022

Conversation

pawlooss1
Copy link
Member

This PR changes all hook handlers in mod_ping module to gen_hook format.

@mongoose-im

This comment was marked as outdated.

@codecov
Copy link

codecov bot commented Oct 21, 2022

Codecov Report

Base: 82.97% // Head: 83.03% // Increases project coverage by +0.05% 🎉

Coverage data is based on head (cdc567b) compared to base (edccf71).
Patch coverage: 94.44% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3821      +/-   ##
==========================================
+ Coverage   82.97%   83.03%   +0.05%     
==========================================
  Files         528      528              
  Lines       33885    33891       +6     
==========================================
+ Hits        28117    28142      +25     
+ Misses       5768     5749      -19     
Impacted Files Coverage Δ
src/mod_ping.erl 95.23% <90.90%> (ø)
src/mongoose_hooks.erl 97.22% <100.00%> (+0.05%) ⬆️
src/async_pools/mongoose_aggregator_worker.erl 63.33% <0.00%> (-5.01%) ⬇️
...bal_distrib/mod_global_distrib_hosts_refresher.erl 66.66% <0.00%> (-2.23%) ⬇️
src/rdbms/mongoose_rdbms.erl 65.26% <0.00%> (-1.06%) ⬇️
src/ejabberd_c2s.erl 88.95% <0.00%> (-0.08%) ⬇️
src/mod_muc_log.erl 62.82% <0.00%> (ø)
src/mod_roster.erl 78.94% <0.00%> (+0.23%) ⬆️
src/pubsub/mod_pubsub_db_rdbms.erl 95.34% <0.00%> (+0.25%) ⬆️
src/ejabberd_service.erl 67.53% <0.00%> (+0.64%) ⬆️
... and 7 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@pawlooss1 pawlooss1 force-pushed the hooks/mod_ping branch 2 times, most recently from 8712c1e to 5d7fb6d Compare October 24, 2022 11:01
@mongoose-im

This comment was marked as outdated.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Oct 25, 2022

small_tests_24 / small_tests / 8007ff7
Reports root / small


small_tests_25 / small_tests / 8007ff7
Reports root / small


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 8007ff7
Reports root/ big
OK: 3994 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / 8007ff7
Reports root/ big
OK: 2103 / Failed: 0 / User-skipped: 784 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 8007ff7
Reports root/ big
OK: 2103 / Failed: 0 / User-skipped: 784 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 8007ff7
Reports root/ big
OK: 3994 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / 8007ff7
Reports root/ big
OK: 3968 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / 8007ff7
Reports root/ big
OK: 2257 / Failed: 1 / User-skipped: 648 / Auto-skipped: 0

pubsub_SUITE:tree+basic:publish_with_max_items_test
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"bob_publish_with_max_items_test_1527@localhost/res1">>,
          escalus_tcp,<0.21947.1>,
          [{event_manager,<0.21852.1>},
           {server,<<"localhost">>},
           {username,<<"bOb_publish_with_max_items_test_1527">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.21852.1>},
            {server,<<"localhost">>},
            {username,<<"bOb_publish_with_max_items_test_1527">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"bob_publish_with_max_items_test_1527">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"bOb_publish_with_max_items_test_1527">>},
           {server,<<"localhost">>},
           {password,<<"makrolika">>},
           {stream_id,<<"a0af40f829c40b32">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {pubsub_tools,receive_notification,3,
       [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
        {line,504}]},
     {pubsub_tools,receive_item_notification,4,
       [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
        {line,303}]},
     {pubsub_...

Report log


pgsql_mnesia_24 / pgsql_mnesia / 8007ff7
Reports root/ big
OK: 4368 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 8007ff7
Reports root/ big
OK: 2581 / Failed: 0 / User-skipped: 641 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 8007ff7
Reports root/ big
OK: 3993 / Failed: 1 / User-skipped: 88 / Auto-skipped: 0

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,4394}]},
     {muc_SUITE,'-hibernated_room_can_be_queried_for_archive/1-fun-0-',3,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4130}]},
     {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,4126}]},
     {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1291}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1223}]}]}}

Report log


riak_mnesia_24 / riak_mnesia / 8007ff7
Reports root/ big
OK: 2427 / Failed: 0 / User-skipped: 627 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / 8007ff7
Reports root/ big
OK: 4354 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / 8007ff7
Reports root/ big
OK: 4368 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 8007ff7
Reports root/ big
OK: 4367 / Failed: 1 / User-skipped: 97 / Auto-skipped: 0

graphql_server_SUITE:admin_http:clustering_http_tests:remove_dead_from_cluster_http
{error,
  {{badrpc,
     {'EXIT',
       {#{cluster_member => mongooseim@localhost,
        reason => set_extra_db_nodes_failed,
        result => {ok,[]}},
        [{mongoose_cluster,set_extra_db_nodes,1,
           [{file,"/home/circleci/project/src/mongoose_cluster.erl"},
          {line,132}]},
         {mongoose_cluster,unsafe_join,2,
           [{file,"/home/circleci/project/src/mongoose_cluster.erl"},
          {line,116}]},
         {mongoose_cluster,with_app_stopped,2,
           [{file,"/home/circleci/project/src/mongoose_cluster.erl"},
          {line,221}]},
         {global,trans,4,[{file,"global.erl"},{line,463}]},
         {mongoose_cluster,join,1,[]}]}}},
   [{distributed_helper,rpc,
      [#{node => mongooseim3@localhost,timeout => 60000},
       mongoose_cluster,join,
       [mongooseim@localhost]],
      [{file,
         "/home/circleci/project/big_tests/tests/distributed_helper.erl"},
       {line,121}]},
    {graphql_server_SUITE,remove_dead_from_cluster_http,1,
      [{file,
         "/home/circleci/project/big_tests/tests/graphql_server_SUITE.erl"},
       {line,247}]},
    {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
    {test_server,run_test_case_eval1,6,
      [{file,"test_server.erl"},{line,1291}]},
    {test_server,run_test_case_eval,9,
      [{file,"test_server.erl"},{line,1223}]}]}}

Report log


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 8007ff7
Reports root/ big
OK: 3994 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 8007ff7
Reports root/ big
OK: 4368 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0

@pawlooss1 pawlooss1 marked this pull request as ready for review October 25, 2022 08:29
Copy link
Collaborator

@NelsonVides NelsonVides left a comment

Choose a reason for hiding this comment

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

Pretty straightforward, only one observation 👌🏽

src/mod_ping.erl Outdated

-spec user_online(Acc, Params, Extra) -> {ok, Acc} when
Acc :: ok,
Params :: #{sid := 'undefined' | ejabberd_sm:sid()},
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is 'undefined' necessary here? It will fail with a function_clause if so 🤔 Also the apostrophes aren't needed, it could be just undefined.

Copy link
Member Author

Choose a reason for hiding this comment

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

I took it from mongoose_hooks:sm_remove_connection_hook/5 and mongoose_hooks:sm_register_connection_hook/4's spec. You're right though, for this handler it makes no sense. I handler fails we're catching error and proceed with other handlers, so I guess there is no need to implement such function clause. I'll simply remove it from spec.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Oct 26, 2022

small_tests_24 / small_tests / 0f576f2
Reports root / small


small_tests_25 / small_tests / 0f576f2
Reports root / small


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 0f576f2
Reports root/ big
OK: 3994 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / 0f576f2
Reports root/ big
OK: 2103 / Failed: 0 / User-skipped: 784 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / 0f576f2
Reports root/ big
OK: 3968 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 0f576f2
Reports root/ big
OK: 3994 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 0f576f2
Reports root/ big
OK: 2103 / Failed: 0 / User-skipped: 784 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 0f576f2
Reports root/ big
OK: 3994 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / 0f576f2
Reports root/ big
OK: 2239 / Failed: 0 / User-skipped: 648 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 0f576f2
Reports root/ big
OK: 4368 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 0f576f2
Reports root/ big
OK: 2581 / Failed: 0 / User-skipped: 641 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 0f576f2
Reports root/ big
OK: 4368 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / 0f576f2
Reports root/ big
OK: 2427 / Failed: 0 / User-skipped: 627 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / 0f576f2
Reports root/ big
OK: 4354 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / 0f576f2
Reports root/ big
OK: 4367 / Failed: 1 / User-skipped: 97 / Auto-skipped: 0

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,4394}]},
     {muc_SUITE,'-hibernated_room_can_be_queried_for_archive/1-fun-0-',3,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4130}]},
     {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,4126}]},
     {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1291}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1223}]}]}}

Report log

@mongoose-im
Copy link
Collaborator

mongoose-im commented Oct 26, 2022

small_tests_24 / small_tests / cdc567b
Reports root / small


small_tests_25 / small_tests / cdc567b
Reports root / small


ldap_mnesia_24 / ldap_mnesia / cdc567b
Reports root/ big
OK: 2103 / Failed: 0 / User-skipped: 784 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / cdc567b
Reports root/ big
OK: 3994 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / cdc567b
Reports root/ big
OK: 3994 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / cdc567b
Reports root/ big
OK: 2103 / Failed: 0 / User-skipped: 784 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / cdc567b
Reports root/ big
OK: 3968 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / cdc567b
Reports root/ big
OK: 2239 / Failed: 0 / User-skipped: 648 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / cdc567b
Reports root/ big
OK: 4002 / Failed: 1 / User-skipped: 88 / Auto-skipped: 0

disco_and_caps_SUITE:disco_with_caps:user_cannot_query_friend_resources_with_unknown_node
{error,{{assertion_failed,assert_many,false,[is_roster_set],[],[]},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {escalus_story,'-make_all_clients_friends/1-fun-0-',2,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,108}]},
     {escalus_utils,'-each_with_index/3-fun-0-',3,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
             {line,87}]},
     {lists,foldl_1,3,[{file,"lists.erl"},{line,1355}]},
     {escalus_utils,'-each_with_index/3-fun-0-',3,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
             {line,87}]},
     {lists,foldl,3,[{file,"lists.erl"},{line,1350}]},
     {escalus_utils,distinct_pairs,2,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
             {line,60}]},
     {escalus_story,make_all_clients_friends,1,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,106}]}]}}

Report log


pgsql_mnesia_24 / pgsql_mnesia / cdc567b
Reports root/ big
OK: 4368 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / cdc567b
Reports root/ big
OK: 2581 / Failed: 0 / User-skipped: 641 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / cdc567b
Reports root/ big
OK: 2427 / Failed: 0 / User-skipped: 627 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / cdc567b
Reports root/ big
OK: 4354 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / cdc567b
Reports root/ big
OK: 4368 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / cdc567b
Reports root/ big
OK: 4368 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0

Copy link
Collaborator

@NelsonVides NelsonVides left a comment

Choose a reason for hiding this comment

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

LGTM 👌🏽

@NelsonVides NelsonVides merged commit 4b4e3b7 into master Oct 26, 2022
@NelsonVides NelsonVides deleted the hooks/mod_ping branch October 26, 2022 11:59
@chrzaszcz chrzaszcz added this to the 6.0.0 milestone Dec 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants