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 ejabberd_router module #3760

Merged
merged 1 commit into from
Sep 16, 2022

Conversation

pawlooss1
Copy link
Member

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

@mongoose-im
Copy link
Collaborator

mongoose-im commented Sep 15, 2022

small_tests_24 / small_tests / bbb4d09
Reports root / small


small_tests_25 / small_tests / bbb4d09
Reports root / small


ldap_mnesia_24 / ldap_mnesia / bbb4d09
Reports root/ big
OK: 1956 / Failed: 0 / User-skipped: 555 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / bbb4d09
Reports root/ big
OK: 3595 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / bbb4d09
Reports root/ big
OK: 3577 / Failed: 1 / User-skipped: 105 / 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


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / bbb4d09
Reports root/ big
OK: 3595 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / bbb4d09
Reports root/ big
OK: 1956 / Failed: 0 / User-skipped: 555 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / bbb4d09
Reports root/ big
OK: 3595 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / bbb4d09
Reports root/ big
OK: 2077 / Failed: 0 / User-skipped: 434 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / bbb4d09
Reports root/ big
OK: 3980 / Failed: 1 / User-skipped: 97 / Auto-skipped: 0

pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription
{error,
  {{badmatch,
     [{xmlel,<<"message">>,
        [{<<"from">>,
        <<"alice_unsubscribe_after_presence_unsubscription_2457@localhost">>},
         {<<"to">>,
        <<"bob_unsubscribe_after_presence_unsubscription_2457@localhost/res1">>},
         {<<"type">>,<<"headline">>}],
        [{xmlel,<<"event">>,
           [{<<"xmlns">>,
           <<"http://jabber.org/protocol/pubsub#event">>}],
           [{xmlel,<<"items">>,
            [{<<"node">>,<<"fwKRjk7HcblmuSLF/K7Q3A==">>}],
            [{xmlel,<<"item">>,
               [{<<"id">>,<<"salmon">>}],
               [{xmlel,<<"entry">>,
                  [{<<"xmlns">>,
                  <<"http://www.w3.org/2005/Atom">>}],
                  []}]}]}]},
         {xmlel,<<"headers">>,
           [{<<"xmlns">>,<<"http://jabber.org/protocol/shim">>}],
           []}]}]},
   [{pep_SUITE,'-unsubscribe_after_presence_unsubscription/1-fun-0-',2,
      [{file,"/home/circleci/project/big_tests/tests/pep_SUITE.erl"},
       {line,384}]},
    {escalus_story,story,4,
      [{file,
         "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,72}]},
    {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


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / bbb4d09
Reports root/ big
OK: 2417 / Failed: 0 / User-skipped: 429 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / bbb4d09
Reports root/ big
OK: 3969 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / bbb4d09
Reports root/ big
OK: 3964 / Failed: 0 / User-skipped: 102 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / bbb4d09
Reports root/ big
OK: 2256 / Failed: 0 / User-skipped: 422 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / bbb4d09
Reports root/ big
OK: 3969 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


small_tests_24 / small_tests / bbb4d09
Reports root / small


small_tests_25 / small_tests / bbb4d09
Reports root / small


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / bbb4d09
Reports root/ big
OK: 3595 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / bbb4d09
Reports root/ big
OK: 1956 / Failed: 0 / User-skipped: 555 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / bbb4d09
Reports root/ big
OK: 3595 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / bbb4d09
Reports root/ big
OK: 3578 / Failed: 0 / User-skipped: 105 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / bbb4d09
Reports root/ big
OK: 1956 / Failed: 0 / User-skipped: 555 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / bbb4d09
Reports root/ big
OK: 2077 / Failed: 0 / User-skipped: 434 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / bbb4d09
Reports root/ big
OK: 3595 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / bbb4d09
Reports root/ big
OK: 3969 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / bbb4d09
Reports root/ big
OK: 2417 / Failed: 0 / User-skipped: 429 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / bbb4d09
Reports root/ big
OK: 3969 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / bbb4d09
Reports root/ big
OK: 3964 / Failed: 0 / User-skipped: 102 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / bbb4d09
Reports root/ big
OK: 3969 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / bbb4d09
Reports root/ big
OK: 2256 / Failed: 0 / User-skipped: 422 / Auto-skipped: 0

@codecov
Copy link

codecov bot commented Sep 15, 2022

Codecov Report

Base: 82.71% // Head: 82.72% // Increases project coverage by +0.00% 🎉

Coverage data is based on head (024fe41) compared to base (ebb3411).
Patch coverage: 50.00% of modified lines in pull request are covered.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #3760   +/-   ##
=======================================
  Coverage   82.71%   82.72%           
=======================================
  Files         529      529           
  Lines       33976    33977    +1     
=======================================
+ Hits        28103    28107    +4     
+ Misses       5873     5870    -3     
Impacted Files Coverage Δ
src/ejabberd_router.erl 76.19% <50.00%> (+0.19%) ⬆️
src/ejabberd.erl 45.00% <0.00%> (-10.00%) ⬇️
src/logger/mongoose_log_filter.erl 78.08% <0.00%> (-1.37%) ⬇️
src/ejabberd_c2s.erl 88.93% <0.00%> (-0.30%) ⬇️
src/mod_muc_log.erl 63.08% <0.00%> (+0.26%) ⬆️
src/mod_muc_room.erl 78.51% <0.00%> (+0.28%) ⬆️
src/inbox/mod_inbox_rdbms_async.erl 72.05% <0.00%> (+1.47%) ⬆️
src/mam/mod_mam_elasticsearch_arch.erl 88.39% <0.00%> (+1.78%) ⬆️
src/elasticsearch/mongoose_elasticsearch.erl 84.61% <0.00%> (+7.69%) ⬆️

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
Copy link
Collaborator

mongoose-im commented Sep 15, 2022

small_tests_24 / small_tests / 024fe41
Reports root / small


small_tests_25 / small_tests / 024fe41
Reports root / small


ldap_mnesia_24 / ldap_mnesia / 024fe41
Reports root/ big
OK: 1956 / Failed: 0 / User-skipped: 555 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 024fe41
Reports root/ big
OK: 3595 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 024fe41
Reports root/ big
OK: 3595 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / 024fe41
Reports root/ big
OK: 3578 / Failed: 0 / User-skipped: 105 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 024fe41
Reports root/ big
OK: 1955 / Failed: 1 / User-skipped: 555 / Auto-skipped: 0

bosh_SUITE:essential_https:accept_higher_hold_value
{error,
  {{assertEqual,
     [{module,bosh_SUITE},
      {line,251},
      {expression,"get_bosh_sessions ( )"},
      {expected,[]},
      {value,
        [{bosh_session,<<"87be7030b26aed54d76f82395037ebcee3185c46">>,
           <9155.5349.0>}]}]},
   [{bosh_SUITE,accept_higher_hold_value,1,
      [{file,"/home/circleci/project/big_tests/tests/bosh_SUITE.erl"},
       {line,251}]},
    {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


pgsql_mnesia_24 / pgsql_mnesia / 024fe41
Reports root/ big
OK: 3969 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 024fe41
Reports root/ big
OK: 3595 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / 024fe41
Reports root/ big
OK: 2077 / Failed: 0 / User-skipped: 434 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 024fe41
Reports root/ big
OK: 2417 / Failed: 0 / User-skipped: 429 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / 024fe41
Reports root/ big
OK: 3964 / Failed: 0 / User-skipped: 102 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 024fe41
Reports root/ big
OK: 3980 / Failed: 1 / User-skipped: 97 / Auto-skipped: 0

pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription
{error,
  {{badmatch,
     [{xmlel,<<"message">>,
        [{<<"from">>,
        <<"alice_unsubscribe_after_presence_unsubscription_2347@localhost">>},
         {<<"to">>,
        <<"bob_unsubscribe_after_presence_unsubscription_2347@localhost/res1">>},
         {<<"type">>,<<"headline">>}],
        [{xmlel,<<"event">>,
           [{<<"xmlns">>,
           <<"http://jabber.org/protocol/pubsub#event">>}],
           [{xmlel,<<"items">>,
            [{<<"node">>,<<"JvoetH3zhzbY/vwYv8L6YA==">>}],
            [{xmlel,<<"item">>,
               [{<<"id">>,<<"salmon">>}],
               [{xmlel,<<"entry">>,
                  [{<<"xmlns">>,
                  <<"http://www.w3.org/2005/Atom">>}],
                  []}]}]}]},
         {xmlel,<<"headers">>,
           [{<<"xmlns">>,<<"http://jabber.org/protocol/shim">>}],
           []}]}]},
   [{pep_SUITE,'-unsubscribe_after_presence_unsubscription/1-fun-0-',2,
      [{file,"/home/circleci/project/big_tests/tests/pep_SUITE.erl"},
       {line,384}]},
    {escalus_story,story,4,
      [{file,
         "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,72}]},
    {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


mssql_mnesia_25 / odbc_mssql_mnesia / 024fe41
Reports root/ big
OK: 3969 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / 024fe41
Reports root/ big
OK: 2256 / Failed: 0 / User-skipped: 422 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 024fe41
Reports root/ big
OK: 1956 / Failed: 0 / User-skipped: 555 / Auto-skipped: 0

@pawlooss1 pawlooss1 marked this pull request as ready for review September 16, 2022 07:49
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.

Straightforward, lgtm 👌🏽

Copy link
Member

@chrzaszcz chrzaszcz left a comment

Choose a reason for hiding this comment

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

Looks good

@chrzaszcz chrzaszcz merged commit 563764e into master Sep 16, 2022
@chrzaszcz chrzaszcz deleted the hooks/ejabberd_router branch September 16, 2022 08:49
@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