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

Log internal-server-errors in mod_privacy #4139

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Log internal-server-errors in mod_privacy #4139

merged 1 commit into from
Oct 11, 2023

Conversation

arcusfelis
Copy link
Contributor

@arcusfelis arcusfelis commented Oct 4, 2023 •
edited

Log internal-server-errors in mod_privacy.
Otherwise you will not see anything in logs, in Mnesia is not started, but mod_privacy is configured with Mnesia backend.

This PR addresses "Nothing in logs, code just ignores Reason variable, which is returned from mod_privacy_backend.

Proposed changes include:

  • Logging

Coverage for the patch is low, because we usually do not test logging.

@codecov
Copy link

codecov bot commented Oct 4, 2023 •
edited

Codecov Report

Attention: 15 lines in your changes are missing coverage. Please review.

Comparison is base (2ea4207) 84.08% compared to head (3780cf6) 84.03%.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #4139      +/-   ##
==========================================
- Coverage   84.08%   84.03%   -0.06%     
==========================================
  Files         558      558              
  Lines       34016    34030      +14     
==========================================
- Hits        28604    28596       -8     
- Misses       5412     5434      +22
Files Coverage Δ
src/privacy/mod_privacy.erl 85.33% <31.81%> (-3.66%) ⬇️

... and 8 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@arcusfelis
Log internal-server-errors in mod_privacy
3780cf6 
Otherwise you will not see anything in logs, in Mnesia is not started,
but mod_privacy is configured with Mnesia backend
@arcusfelis arcusfelis force-pushed the log-internal-server-errors-in-mod-privacy branch from 9139193 to 3780cf6 Compare October 4, 2023 15:40
@esl esl deleted a comment from mongoose-im Oct 4, 2023
@mongoose-im
Copy link
Collaborator

mongoose-im commented Oct 4, 2023 •
edited

elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 3780cf6
Reports root/ big
OK: 369 / Failed: 0 / User-skipped: 38 / Auto-skipped: 0

small_tests_24 / small_tests / 3780cf6
Reports root / small

small_tests_25 / small_tests / 3780cf6
Reports root / small

small_tests_25_arm64 / small_tests / 3780cf6
Reports root / small

ldap_mnesia_25 / ldap_mnesia / 3780cf6
Reports root/ big
OK: 2303 / Failed: 0 / User-skipped: 864 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / 3780cf6
Reports root/ big
OK: 2303 / Failed: 0 / User-skipped: 864 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 3780cf6
Reports root/ big
OK: 4267 / Failed: 0 / User-skipped: 112 / Auto-skipped: 0

dynamic_domains_mysql_redis_25 / mysql_redis / 3780cf6
Reports root/ big
OK: 4235 / Failed: 0 / User-skipped: 144 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 3780cf6
Reports root/ big
OK: 4267 / Failed: 0 / User-skipped: 112 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 3780cf6
Reports root/ big
OK: 4258 / Failed: 6 / User-skipped: 115 / Auto-skipped: 0

muc_SUITE:register:user_changes_nick 
{error,
  {{assertion_failed,assert,is_iq_result,
     [{xmlel,<<"iq">>,
        [{<<"type">>,<<"set">>},
         {<<"id">>,<<"cb6837086ec94af2d257a073ee5899a4">>},
         {<<"to">>,<<"groupchats.domain.example.com">>}],
        [{xmlel,<<"query">>,
           [{<<"xmlns">>,<<"jabber:iq:register">>}],
           [{xmlel,<<"x">>,
            [{<<"xmlns">>,<<"jabber:x:data">>},
             {<<"type">>,<<"submit">>}],
            [{xmlel,<<"field">>,
               [{<<"type">>,<<"hidden">>},
                {<<"var">>,<<"FORM_TYPE">>}],
               [{xmlel,<<"value">>,[],
                  [{xmlcdata,<<"jabber:iq:register">>}]}]},
             {xmlel,<<"field">>,
               [{<<"type">>,<<"text-single">>},
                {<<"var">>,<<"nick">>}],
               [{xmlel,<<"value">>,[],
                  [{xmlcdata,
                     <<"thirdwitch1room-9f7e156235">>}]}]}]}]}]}],
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"groupchats.domain.example.com">>},
        {<<"to">>,
         <<"alice_user_changes_nick_2611@domain.example.com/res1">>},
        {<<"type">>,<<"error">>},
        {<<"id">>,<<"cb6837086ec94af2d257a073ee5899a4">>}],
       [{xmlel,<<"query">>,
          [{<<"xmlns">>,<<"jabber:iq:register">>}],
          [{xmlel,<<"x">>,
             [{<<"xmlns">>,<<"jabber:x:data">>},
            {<<"type">>,<<"submit">>}],
             [{xmlel,<<"field">>,
              [{<<"type">>,<<"hidden">>},
               {<<"var">>,<<"FORM_TYPE">>}],
              [{xm...

Report log

muc_SUITE:register:user_submits_registration_form 
{error,
  {thrown,
    {timeout,
      [{escalus_connection,receive_stanza,2,
         [{file,
            "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_connection.erl"},
          {line,303}]},
       {muc_SUITE,'-user_submits_registration_form/1-fun-0-',1,
         [{file,
            "/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
          {line,2759}]},
       {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

muc_SUITE:register:user_submits_registration_form_twice 
{error,
  {thrown,
    {timeout,
      [{escalus_connection,receive_stanza,2,
         [{file,
            "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_connection.erl"},
          {line,303}]},
       {muc_SUITE,'-user_submits_registration_form_twice/1-fun-0-',1,
         [{file,
            "/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
          {line,2773}]},
       {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

muc_SUITE:register:user_unregisters_nick_twice 
{error,
  {thrown,
    {timeout,
      [{escalus_connection,receive_stanza,2,
         [{file,
            "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_connection.erl"},
          {line,303}]},
       {muc_SUITE,'-user_unregisters_nick_twice/1-fun-0-',1,
         [{file,
            "/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
          {line,2804}]},
       {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

muc_SUITE:register:user_asks_for_registration_form 
{error,
  {thrown,
    {timeout,
      [{escalus_connection,receive_stanza,2,
         [{file,
            "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_connection.erl"},
          {line,303}]},
       {muc_SUITE,get_nick,1,
         [{file,
            "/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
          {line,5116}]},
       {muc_SUITE,'-user_asks_for_registration_form/1-fun-0-',1,
         [{file,
            "/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
          {line,2750}]},
       {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

muc_SUITE:register:user_unregisters_nick 
{error,
  {thrown,
    {timeout,
      [{escalus_connection,receive_stanza,2,
         [{file,
            "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_connection.erl"},
          {line,303}]},
       {muc_SUITE,get_nick,1,
         [{file,
            "/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
          {line,5116}]},
       {muc_SUITE,'-user_unregisters_nick/1-fun-0-',1,
         [{file,
            "/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
          {line,2795}]},
       {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

internal_mnesia_25 / internal_mnesia / 3780cf6
Reports root/ big
OK: 2453 / Failed: 0 / User-skipped: 714 / Auto-skipped: 0

pgsql_cets_25 / pgsql_cets / 3780cf6
Reports root/ big
OK: 4654 / Failed: 0 / User-skipped: 121 / Auto-skipped: 0

mysql_redis_25 / mysql_redis / 3780cf6
Reports root/ big
OK: 4636 / Failed: 0 / User-skipped: 139 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 3780cf6
Reports root/ big
OK: 4656 / Failed: 0 / User-skipped: 119 / Auto-skipped: 0

pgsql_mnesia_25 / pgsql_mnesia / 3780cf6
Reports root/ big
OK: 4656 / Failed: 0 / User-skipped: 119 / Auto-skipped: 0

mssql_mnesia_25 / odbc_mssql_mnesia / 3780cf6
Reports root/ big
OK: 4653 / Failed: 0 / User-skipped: 122 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 3780cf6
Reports root/ big
OK: 4264 / Failed: 0 / User-skipped: 115 / Auto-skipped: 0

@arcusfelis arcusfelis marked this pull request as ready for review October 4, 2023 20:23
DenysGonchar
DenysGonchar approved these changes Oct 10, 2023
View reviewed changes
Copy link
Collaborator

@DenysGonchar DenysGonchar left a comment

Choose a reason for hiding this comment

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

LGTM

@chrzaszcz chrzaszcz merged commit 51dbdd1 into master Oct 11, 2023
3 of 4 checks passed
@chrzaszcz chrzaszcz deleted the log-internal-server-errors-in-mod-privacy branch October 11, 2023 09:26
@chrzaszcz chrzaszcz added this to the 6.2.0 milestone Dec 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DenysGonchar DenysGonchar DenysGonchar approved these changes

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@arcusfelis @mongoose-im @DenysGonchar @chrzaszcz