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

Remove unused flat config format #3310

Merged
merged 1 commit into from
Sep 30, 2021
Merged

Remove unused flat config format #3310

merged 1 commit into from
Sep 30, 2021

Conversation

chrzaszcz
Copy link
Member

@chrzaszcz chrzaszcz commented Sep 30, 2021

The flat config format should have been removed already. The leftover file is unused.

@codecov
Copy link

codecov bot commented Sep 30, 2021

Codecov Report

Merging #3310 (b9ffbf3) into master (0528e05) will increase coverage by 0.45%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3310      +/-   ##
==========================================
+ Coverage   80.19%   80.64%   +0.45%     
==========================================
  Files         398      397       -1     
  Lines       32595    32416     -179     
==========================================
+ Hits        26140    26143       +3     
+ Misses       6455     6273     -182     
Impacted Files Coverage Δ
src/mongoose_tcp_listener.erl 76.59% <0.00%> (-4.26%) ⬇️
src/domain/mongoose_domain_sql.erl 82.85% <0.00%> (-2.86%) ⬇️
src/mam/mod_mam_muc_rdbms_arch.erl 94.94% <0.00%> (-2.03%) ⬇️
src/logger/mongoose_json_formatter.erl 84.00% <0.00%> (-2.00%) ⬇️
src/domain/mongoose_domain_loader.erl 77.35% <0.00%> (-1.89%) ⬇️
src/global_distrib/mod_global_distrib_receiver.erl 78.88% <0.00%> (-1.12%) ⬇️
src/metrics/mongoose_metrics.erl 95.45% <0.00%> (-0.65%) ⬇️
src/ejabberd_c2s.erl 89.00% <0.00%> (-0.23%) ⬇️
src/mod_muc_room.erl 77.12% <0.00%> (-0.06%) ⬇️
src/mod_muc_log.erl 77.88% <0.00%> (ø)
... and 4 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 0528e05...b9ffbf3. Read the comment docs.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Sep 30, 2021

small_tests_24 / small_tests / b9ffbf3
Reports root / small


internal_mnesia_24 / internal_mnesia / b9ffbf3
Reports root/ big
OK: 1589 / Failed: 0 / User-skipped: 295 / Auto-skipped: 0


small_tests_23 / small_tests / b9ffbf3
Reports root / small


dynamic_domains_24 / pgsql_mnesia / b9ffbf3
Reports root/ big
OK: 2700 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / b9ffbf3
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 398 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / b9ffbf3
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 398 / Auto-skipped: 0


dynamic_domains_23 / pgsql_mnesia / b9ffbf3
Reports root/ big
OK: 2700 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / b9ffbf3
Reports root/ big
OK: 1862 / Failed: 0 / User-skipped: 321 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / b9ffbf3
Reports root/ big
OK: 3069 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / b9ffbf3
Reports root/ big
OK: 3069 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / b9ffbf3
Reports root/ big
OK: 3070 / Failed: 1 / User-skipped: 228 / Auto-skipped: 0

jingle_SUITE:all:resp_4xx_from_sip_proxy_results_in_session_terminate
{error,
  {{assertion_failed,assert,is_iq_result,
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"error.480@localhost">>},
        {<<"to">>,
         <<"alice_resp_4xx_from_sip_proxy_results_in_session_terminate_14.743114@localhost/res1">>},
        {<<"id">>,<<"2271645b-76f0-475d-acaf-98f60bd80b35">>},
        {<<"type">>,<<"set">>}],
       [{xmlel,<<"jingle">>,
          [{<<"xmlns">>,<<"urn:xmpp:jingle:1">>},
           {<<"action">>,<<"session-terminate">>},
           {<<"sid">>,<<"3e4c840e-2811-49d8-af94-5cf9b4643972">>}],
          [{xmlel,<<"reason">>,[],
             [{xmlel,<<"general-error">>,[],[]},
            {xmlel,<<"sip-error">>,
              [{<<"code">>,<<"480">>}],
              [{xmlcdata,<<"Temporarily Unavailable">>}]}]}]}]},
     "<iq from='error.480@localhost' to='alice_resp_4xx_from_sip_proxy_results_in_session_terminate_14.743114@localhost/res1' id='2271645b-76f0-475d-acaf-98f60bd80b35' type='set'><jingle xmlns='urn:xmpp:jingle:1' action='session-terminate' sid='3e4c840e-2811-49d8-af94-5cf9b4643972'><reason><general-error/><sip-error code='480'>Temporarily Unavailable</sip-error></reason></jingle></iq>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {jingle_SUITE,send_initiate_and_wait_for_first_iq_set,2,
      [{file,"/home/circleci/app/big_tests/tests/jingle_SUITE.erl"},
       {line,395}]},
    {jingle_SUITE,
      '-res...

Report log


pgsql_mnesia_24 / pgsql_mnesia / b9ffbf3
Reports root/ big
OK: 3069 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / b9ffbf3
Reports root/ big
OK: 1734 / Failed: 2 / User-skipped: 324 / Auto-skipped: 0

rest_client_SUITE:muc:messages_can_be_paginated_in_room
{error,
  {{assertion_failed,assert,is_chat_message,
     [<<"3f5cc2fd">>],
     {xmlel,<<"message">>,
       [{<<"to">>,<<"[email protected]">>},
        {<<"type">>,<<"chat">>}],
       [{xmlel,<<"body">>,[],[{xmlcdata,<<"c7111fe4">>}]}]},
     "<message to='[email protected]' type='chat'><body>c7111fe4</body></message>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {rest_client_SUITE,assert_room_messages,2,
      [{file,"/home/circleci/app/big_tests/tests/rest_client_SUITE.erl"},
       {line,772}]},
    {escalus_story,story,4,
      [{file,
         "/home/circleci/app/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

s2s_SUITE:node1_tls_optional_node2_tls_required:simple_message
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,<<"alice_simple_message_12.153165@fed1/res1">>,
          escalus_tcp,<0.13063.1>,
          [{event_manager,<0.13059.1>},
           {server,<<"fed1">>},
           {username,<<"alice_simple_message_12.153165">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.13059.1>},
            {server,<<"fed1">>},
            {username,<<"alice_simple_message_12.153165">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"alice_simple_message_12.153165">>},
           {server,<<"fed1">>},
           {host,<<"localhost">>},
           {port,5242},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"alice_simple_message_12.153165">>},
           {server,<<"fed1">>},
           {host,<<"localhost">>},
           {port,5242},
           {password,<<"makota2">>},
           {stream_id,<<"a0048b2279bb9c9d">>}]},
        10000],
       [{file,
          "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {s2s_SUITE,'-simple_message/1-fun-0-',2,
       [{file,"/home/circleci/app/big_tests/tests/s2s_SUITE.erl"},
        {line,124}]},
     {escalus_story,story,4,
       [{file,
          "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
        {line,72}]},
     {test_serve...

Report log

@chrzaszcz chrzaszcz marked this pull request as ready for review September 30, 2021 12:42
@vkatsuba vkatsuba merged commit 3a8530b into master Sep 30, 2021
@vkatsuba vkatsuba deleted the remove-flat-config branch September 30, 2021 12:54
@Premwoik Premwoik added this to the 5.0.0 milestone Oct 5, 2021
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