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

Fix minor c2s issues #3972

Merged
merged 2 commits into from
Feb 24, 2023
Merged

Fix minor c2s issues #3972

merged 2 commits into from
Feb 24, 2023

Conversation

NelsonVides
Copy link
Collaborator

@NelsonVides NelsonVides commented Feb 24, 2023

Accept presence of type 'available', even if this doesn't seem correct from the RFC perspective, I have seen client code sending such presence.

Also fix the key c2s_state->c2s_data in the logger filters.

Even if this doesn't seem correct from the RFC perspective,
I have seen client code sending such presence.
@mongoose-im
Copy link
Collaborator

mongoose-im commented Feb 24, 2023

small_tests_24 / small_tests / 46f1e23
Reports root / small


small_tests_25 / small_tests / 46f1e23
Reports root / small


ldap_mnesia_24 / ldap_mnesia / 46f1e23
Reports root/ big
OK: 2224 / Failed: 0 / User-skipped: 825 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 46f1e23
Reports root/ big
OK: 4174 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 46f1e23
Reports root/ big
OK: 2224 / Failed: 0 / User-skipped: 825 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 46f1e23
Reports root/ big
OK: 4171 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / 46f1e23
Reports root/ big
OK: 4148 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 46f1e23
Reports root/ big
OK: 4174 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / 46f1e23
Reports root/ big
OK: 2366 / Failed: 0 / User-skipped: 683 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / 46f1e23
Reports root/ big
OK: 2582 / Failed: 1 / User-skipped: 654 / Auto-skipped: 0

pubsub_SUITE:tree+basic:subscribe_options_separate_request_test
{error,{{badmatch,false},
    [{pubsub_tools,check_response,2,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,491}]},
     {pubsub_tools,receive_response,3,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,481}]},
     {pubsub_tools,receive_and_check_response,4,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,471}]},
     {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 / 46f1e23
Reports root/ big
OK: 2726 / Failed: 0 / User-skipped: 662 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 46f1e23
Reports root/ big
OK: 4554 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / 46f1e23
Reports root/ big
OK: 4540 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / 46f1e23
Reports root/ big
OK: 4551 / Failed: 0 / User-skipped: 100 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 46f1e23
Reports root/ big
OK: 4553 / Failed: 1 / User-skipped: 97 / Auto-skipped: 0

graphql_roster_SUITE:admin_roster_http:admin_decline_subscription_ask
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"bob_admin_decline_subscription_ask_1294@localhost/res1">>,
          escalus_tcp,<0.1741.1>,
          [{event_manager,<0.1739.1>},
           {server,<<"localhost">>},
           {username,<<"bOb_admin_decline_subscription_ask_1294">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.1739.1>},
            {server,<<"localhost">>},
            {username,
              <<"bOb_admin_decline_subscription_ask_1294">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"bob_admin_decline_subscription_ask_1294">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"bOb_admin_decline_subscription_ask_1294">>},
           {server,<<"localhost">>},
           {password,<<"makrolika">>},
           {stream_id,<<"c267ea776d517b4f">>}]},
        1],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {graphql_roster_SUITE,admin_decline_subscription_ask_story,3,
       [{file,
          "/home/circleci/project/big_tests/tests/graphql_roster_SUITE.erl"},
        {line,255}]},
     {escalus_story,story,4,
       [{file,
          "/home/circleci/project/big_tests/_b...

Report log


pgsql_mnesia_24 / pgsql_mnesia / 46f1e23
Reports root/ big
OK: 4554 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0

@codecov
Copy link

codecov bot commented Feb 24, 2023

Codecov Report

Base: 83.56% // Head: 83.60% // Increases project coverage by +0.03% 🎉

Coverage data is based on head (46f1e23) compared to base (db8b0bf).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3972      +/-   ##
==========================================
+ Coverage   83.56%   83.60%   +0.03%     
==========================================
  Files         538      538              
  Lines       34007    34007              
==========================================
+ Hits        28419    28431      +12     
+ Misses       5588     5576      -12     
Impacted Files Coverage Δ
src/mod_presence.erl 86.06% <ø> (ø)
src/logger/mongoose_log_filter.erl 88.31% <100.00%> (+5.19%) ⬆️
src/logger/mongoose_flatlog_formatter.erl 71.42% <0.00%> (-28.58%) ⬇️
src/logger/mongoose_json_formatter.erl 86.00% <0.00%> (-6.00%) ⬇️
src/mam/mod_mam_muc_rdbms_arch_async.erl 82.85% <0.00%> (-2.86%) ⬇️
src/pubsub/mod_pubsub.erl 73.48% <0.00%> (ø)
src/mod_roster.erl 79.04% <0.00%> (+0.47%) ⬆️
src/ejabberd_s2s_out.erl 63.27% <0.00%> (+0.74%) ⬆️
src/pubsub/mod_pubsub_db_mnesia.erl 93.24% <0.00%> (+0.84%) ⬆️
src/stream_management/mod_stream_management.erl 89.55% <0.00%> (+1.19%) ⬆️
... and 3 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.

@NelsonVides NelsonVides changed the title Accept presence of type 'available' Fix minor c2s issues Feb 24, 2023
@NelsonVides NelsonVides marked this pull request as ready for review February 24, 2023 16:18
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

@DenysGonchar DenysGonchar merged commit eb1762f into master Feb 24, 2023
@DenysGonchar DenysGonchar deleted the c2s/quickfixes branch February 24, 2023 17:09
@jacekwegr jacekwegr added this to the 6.1.0 milestone Apr 26, 2023
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