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

Put mod_jingle_sip options in a map with defaults #3600

Merged
merged 6 commits into from
Mar 28, 2022

Conversation

gustawlippa
Copy link
Contributor

@gustawlippa gustawlippa commented Mar 21, 2022

Put options in a map with defaults.
Added a possibility to configure options that were used in the code, and documented these new options. However, these are not tested yet, and from what I understand, without host types the username-phone mapping won't work great.

@codecov
Copy link

codecov bot commented Mar 21, 2022

Codecov Report

Merging #3600 (e17c1b6) into master (a9c68bd) will decrease coverage by 0.00%.
The diff coverage is 71.42%.

@@            Coverage Diff             @@
##           master    #3600      +/-   ##
==========================================
- Coverage   80.89%   80.89%   -0.01%     
==========================================
  Files         426      426              
  Lines       32250    32252       +2     
==========================================
  Hits        26090    26090              
- Misses       6160     6162       +2     
Impacted Files Coverage Δ
src/jingle_sip/jingle_sip_helper.erl 70.58% <42.85%> (-16.08%) ⬇️
src/jingle_sip/mod_jingle_sip.erl 79.84% <100.00%> (ø)
...rc/smart_markers/mod_smart_markers_rdbms_async.erl 85.18% <0.00%> (-3.71%) ⬇️
src/inbox/mod_inbox.erl 87.42% <0.00%> (-1.72%) ⬇️
src/inbox/mod_inbox_rdbms_async.erl 64.40% <0.00%> (-1.70%) ⬇️
src/logger/mongoose_log_filter.erl 78.08% <0.00%> (-1.37%) ⬇️
src/rdbms/mongoose_rdbms.erl 62.54% <0.00%> (-1.10%) ⬇️
src/inbox/mod_inbox_rdbms.erl 93.12% <0.00%> (-0.63%) ⬇️
src/pubsub/mod_pubsub.erl 73.07% <0.00%> (+0.18%) ⬆️
src/ejabberd_c2s.erl 88.94% <0.00%> (+0.29%) ⬆️
... and 3 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 a9c68bd...e17c1b6. Read the comment docs.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Mar 21, 2022

small_tests_24 / small_tests / 6959d03
Reports root / small


small_tests_23 / small_tests / 6959d03
Reports root / small


dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 6959d03
Reports root/ big
OK: 2822 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_mysql_redis_24 / mysql_redis / 6959d03
Reports root/ big
OK: 2805 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 6959d03
Reports root/ big
OK: 2822 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 6959d03
Reports root/ big
OK: 2822 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / 6959d03
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / 6959d03
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


internal_mnesia_24 / internal_mnesia / 6959d03
Reports root/ big
OK: 1546 / Failed: 0 / User-skipped: 358 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / 6959d03
Reports root/ big
OK: 3196 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 6959d03
Reports root/ big
OK: 1853 / Failed: 0 / User-skipped: 366 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 6959d03
Reports root/ big
OK: 3196 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / 6959d03
Reports root/ big
OK: 3191 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / 6959d03
Reports root/ big
OK: 3196 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / 6959d03
Reports root/ big
OK: 1696 / Failed: 0 / User-skipped: 365 / Auto-skipped: 0

@mongoose-im
Copy link
Collaborator

mongoose-im commented Mar 21, 2022

small_tests_24 / small_tests / fa30cf8
Reports root / small


small_tests_23 / small_tests / fa30cf8
Reports root / small


dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / fa30cf8
Reports root/ big
OK: 2822 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / fa30cf8
Reports root/ big
OK: 2822 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / fa30cf8
Reports root/ big
OK: 2822 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / fa30cf8
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / fa30cf8
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


internal_mnesia_24 / internal_mnesia / fa30cf8
Reports root/ big
OK: 1546 / Failed: 0 / User-skipped: 358 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / fa30cf8
Reports root/ big
OK: 3196 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / fa30cf8
Reports root/ big
OK: 3196 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / fa30cf8
Reports root/ big
OK: 1853 / Failed: 0 / User-skipped: 366 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / fa30cf8
Reports root/ big
OK: 3196 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / fa30cf8
Reports root/ big
OK: 3191 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / fa30cf8
Reports root/ big
OK: 1696 / Failed: 0 / User-skipped: 365 / Auto-skipped: 0

@gustawlippa gustawlippa force-pushed the mod_jingle_sip-map-config branch 2 times, most recently from 188642d to 4837817 Compare March 21, 2022 16:31
@mongoose-im
Copy link
Collaborator

mongoose-im commented Mar 21, 2022

small_tests_24 / small_tests / 188642d
Reports root / small


small_tests_23 / small_tests / 188642d
Reports root / small


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 188642d
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_mysql_redis_24 / mysql_redis / 188642d
Reports root/ big
OK: 2807 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 188642d
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / 188642d
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 188642d
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / 188642d
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


internal_mnesia_24 / internal_mnesia / 188642d
Reports root/ big
OK: 1546 / Failed: 0 / User-skipped: 358 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 188642d
Reports root/ big
OK: 1853 / Failed: 0 / User-skipped: 366 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 188642d
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / 188642d
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / 188642d
Reports root/ big
OK: 3193 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / 188642d
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / 188642d
Reports root/ big
OK: 1696 / Failed: 0 / User-skipped: 365 / Auto-skipped: 0

@mongoose-im

This comment was marked as outdated.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Mar 22, 2022

small_tests_24 / small_tests / bb5a3d5
Reports root / small


small_tests_23 / small_tests / bb5a3d5
Reports root / small


dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / bb5a3d5
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_mysql_redis_24 / mysql_redis / bb5a3d5
Reports root/ big
OK: 2807 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / bb5a3d5
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / bb5a3d5
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / bb5a3d5
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / bb5a3d5
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


internal_mnesia_24 / internal_mnesia / bb5a3d5
Reports root/ big
OK: 1546 / Failed: 0 / User-skipped: 358 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / bb5a3d5
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / bb5a3d5
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / bb5a3d5
Reports root/ big
OK: 1853 / Failed: 0 / User-skipped: 366 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / bb5a3d5
Reports root/ big
OK: 3193 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / bb5a3d5
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / bb5a3d5
Reports root/ big
OK: 1696 / Failed: 0 / User-skipped: 365 / Auto-skipped: 0

@gustawlippa gustawlippa marked this pull request as ready for review March 22, 2022 10:09
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, I only added minor comments.

doc/modules/mod_jingle_sip.md Outdated Show resolved Hide resolved
src/jingle_sip/mod_jingle_sip.erl Outdated Show resolved Hide resolved
gustawlippa and others added 2 commits March 23, 2022 16:39
Co-authored-by: Paweł Chrząszcz <pawel.chrzaszcz@erlang-solutions.com>
@mongoose-im
Copy link
Collaborator

mongoose-im commented Mar 23, 2022

small_tests_24 / small_tests / c0f8f92
Reports root / small


small_tests_23 / small_tests / c0f8f92
Reports root / small


dynamic_domains_mysql_redis_24 / mysql_redis / c0f8f92
Reports root/ big
OK: 2807 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / c0f8f92
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / c0f8f92
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / c0f8f92
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / c0f8f92
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / c0f8f92
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


internal_mnesia_24 / internal_mnesia / c0f8f92
Reports root/ big
OK: 1546 / Failed: 0 / User-skipped: 358 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / c0f8f92
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / c0f8f92
Reports root/ big
OK: 3193 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / c0f8f92
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / c0f8f92
Reports root/ big
OK: 1853 / Failed: 0 / User-skipped: 366 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / c0f8f92
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / c0f8f92
Reports root/ big
OK: 1696 / Failed: 0 / User-skipped: 365 / Auto-skipped: 0


small_tests_24 / small_tests / c0f8f92
Reports root / small


small_tests_23 / small_tests / c0f8f92
Reports root / small


dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / c0f8f92
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / c0f8f92
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_mysql_redis_24 / mysql_redis / c0f8f92
Reports root/ big
OK: 2807 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / c0f8f92
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / c0f8f92
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / c0f8f92
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


internal_mnesia_24 / internal_mnesia / c0f8f92
Reports root/ big
OK: 1546 / Failed: 0 / User-skipped: 358 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / c0f8f92
Reports root/ big
OK: 1853 / Failed: 0 / User-skipped: 366 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / c0f8f92
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / c0f8f92
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / c0f8f92
Reports root/ big
OK: 3193 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / c0f8f92
Reports root/ big
OK: 3210 / Failed: 1 / User-skipped: 142 / 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,4383}]},
     {muc_SUITE,'-hibernated_room_can_be_queried_for_archive/1-fun-0-',3,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4124}]},
     {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,4120}]},
     {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


riak_mnesia_24 / riak_mnesia / c0f8f92
Reports root/ big
OK: 1696 / Failed: 0 / User-skipped: 365 / Auto-skipped: 0

src/jingle_sip/jingle_sip_helper.erl Outdated Show resolved Hide resolved
@mongoose-im
Copy link
Collaborator

mongoose-im commented Mar 28, 2022

small_tests_24 / small_tests / e17c1b6
Reports root / small


small_tests_23 / small_tests / e17c1b6
Reports root / small


dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / e17c1b6
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_mysql_redis_24 / mysql_redis / e17c1b6
Reports root/ big
OK: 2807 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / e17c1b6
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / e17c1b6
Reports root/ big
OK: 2824 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / e17c1b6
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / e17c1b6
Reports root/ big
OK: 1505 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


internal_mnesia_24 / internal_mnesia / e17c1b6
Reports root/ big
OK: 1546 / Failed: 0 / User-skipped: 358 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / e17c1b6
Reports root/ big
OK: 3197 / Failed: 1 / User-skipped: 142 / 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,<<"082b7591884537cdc67f8be55e35ad20da6468b2">>,
           <8576.6962.0>}]}]},
   [{bosh_SUITE,'-accept_higher_hold_value/1-fun-2-',0,
      [{file,"/home/circleci/project/big_tests/tests/bosh_SUITE.erl"},
       {line,251}]},
    {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,1754}]},
    {test_server,run_test_case_eval1,6,
      [{file,"test_server.erl"},{line,1263}]},
    {test_server,run_test_case_eval,9,
      [{file,"test_server.erl"},{line,1195}]}]}}

Report log


pgsql_mnesia_24 / pgsql_mnesia / e17c1b6
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / e17c1b6
Reports root/ big
OK: 1853 / Failed: 0 / User-skipped: 366 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / e17c1b6
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / e17c1b6
Reports root/ big
OK: 3193 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / e17c1b6
Reports root/ big
OK: 1696 / Failed: 0 / User-skipped: 365 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / e17c1b6
Reports root/ big
OK: 3198 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

@chrzaszcz chrzaszcz merged commit f1bca29 into master Mar 28, 2022
@chrzaszcz chrzaszcz deleted the mod_jingle_sip-map-config branch March 28, 2022 11:34
@Premwoik Premwoik added this to the 5.1.0 milestone May 25, 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.

None yet

5 participants