Event pusher opts in a map #3603
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
Codecov Report
@@ Coverage Diff @@
## master #3603 +/- ##
===========================================
- Coverage 80.92% 18.33% -62.60%
===========================================
Files 425 425
Lines 32241 32194 -47
===========================================
- Hits 26091 5902 -20189
- Misses 6150 26292 +20142
Continue to review full report at Codecov.
|
chrzaszcz
force-pushed
the
mod_event_pusher-map
branch
from
1a6b934 to
2f125f5
Compare
This comment was marked as outdated.
This comment was marked as outdated.
chrzaszcz
force-pushed
the
mod_event_pusher-map
branch
from
2f125f5 to
d97d4dc
Compare
This comment was marked as outdated.
This comment was marked as outdated.
chrzaszcz
force-pushed
the
mod_event_pusher-map
branch
from
d97d4dc to
ff34f9c
Compare
This comment was marked as outdated.
This comment was marked as outdated.
chrzaszcz
force-pushed
the
mod_event_pusher-map
branch
from
ff34f9c to
58abd75
Compare
This comment was marked as outdated.
This comment was marked as outdated.
- Use host types - It is best to register hooks last, so it is better not to have a dependency, which is started first
chrzaszcz
force-pushed
the
mod_event_pusher-map
branch
from
58abd75 to
76998b6
Compare
This comment was marked as outdated.
This comment was marked as outdated.
The event_pusher one has to run before the inbox one to ensure that unread_count has not been yet updated by mod_inbox. mod_inbox_rdbms:get_inbox_unread/4 function always adds 1 to the result The order can't be easily swapped because of the possibility of having asynchronous workers for inbox.
- 'push_notifications' still needs the HostType separately because the Acc can be just 'ok'
Drop the host type where it can be obtained from the acc
Host type is now obtained from the acc. Also: don't use the config of the sender's domain (which can be hosted by a different server) to figure out if the recipient's message triggers a push notification
chrzaszcz
force-pushed
the
mod_event_pusher-map
branch
2 times, most recently
from
24c1294 to
59a2cae
Compare
- Drop the 'backend' subsection, which provided no extra value - Do not store backends in ets, the config is enough - Order backends alphabetically - Simplify config_metrics logic
- Use maps for opts - Add a new option with a list of handlers - previously it was impossible to set up multiple handlers, which was against the docs. - Process the path prefix on parsing (only once) - Use host types
- Use maps for opts - Use host types - Use the wpool defaults from mongoose_config_spec
Use host types, update specs for module opts
- Use host types and module opts in a map
- Use maps for opts - Add a type for exchange opts - Make the code more straightforward
- Use maps for opts - Use host types
- Use maps and defaults - Use a separate helper for the HTTP handlers, because it is an item in a list, and thus it doesn't have a path - Test wpool in a generic way, in the future we can rework other wpool tests to do the same - Check multiple handlers for HTTP
- Do not test changing config on the fly, this is not supported - Start the full module - Host type is the same as domain, but in the future we can change this
- Configure event_pusher with maps - Path should be binary without the leading '/' - Remove obsolete options that had no effect
chrzaszcz
force-pushed
the
mod_event_pusher-map
branch
from
59a2cae to
35b1320
Compare
This comment was marked as outdated.
This comment was marked as outdated.
- Use opts in maps - Start module always in init_per_testcase
- Set opts in maps
- Set opts in maps - Return the correct Acc in process_packet to avoid errors in logs
- Set opts in maps
- Set opts in maps - Refactor code in a functional way
chrzaszcz
force-pushed
the
mod_event_pusher-map
branch
from
35b1320 to
0cab387
Compare
This comment was marked as outdated.
This comment was marked as outdated.
The backend can be reported from mod_event_pusher_push, it looks cleaner this way.
|
small_tests_24 / small_tests / dd4a097 small_tests_23 / small_tests / dd4a097 dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / dd4a097 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / dd4a097 dynamic_domains_mysql_redis_24 / mysql_redis / dd4a097 dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / dd4a097 ldap_mnesia_24 / ldap_mnesia / dd4a097 ldap_mnesia_23 / ldap_mnesia / dd4a097 internal_mnesia_24 / internal_mnesia / dd4a097 elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / dd4a097 pgsql_mnesia_24 / pgsql_mnesia / dd4a097 pgsql_mnesia_23 / pgsql_mnesia / dd4a097 mysql_redis_24 / mysql_redis / dd4a097 mssql_mnesia_24 / odbc_mssql_mnesia / dd4a097 disco_and_caps_SUITE:disco_with_caps:user_cannot_query_friend_resources_with_unknown_node{error,{{assertion_failed,assert_many,false,[is_presence],[],[]},
[{escalus_new_assert,assert_true,2,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
{line,84}]},
{escalus_story,'-make_all_clients_friends/1-fun-0-',2,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,109}]},
{escalus_utils,'-each_with_index/3-fun-0-',3,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
{line,87}]},
{lists,foldl,3,[{file,"lists.erl"},{line,1267}]},
{escalus_utils,'-each_with_index/3-fun-0-',3,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
{line,87}]},
{lists,foldl,3,[{file,"lists.erl"},{line,1267}]},
{escalus_utils,distinct_pairs,2,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
{line,60}]},
{escalus_story,make_all_clients_friends,1,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,106}]}]}}riak_mnesia_24 / riak_mnesia / dd4a097 dynamic_domains_mysql_redis_24 / mysql_redis / dd4a097 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / dd4a097 dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / dd4a097 dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / dd4a097 ldap_mnesia_24 / ldap_mnesia / dd4a097 rest_client_SUITE:messages:msg_is_sent_and_delivered_over_sse{error,{{badmap,{error,timeout}},
[{erlang,map_get,
[data,{error,timeout}],
[{error_info,#{module => erl_erts_errors}}]},
{rest_client_SUITE,msg_is_sent_and_delivered_over_sse,1,
[{file,"/home/circleci/project/big_tests/tests/rest_client_SUITE.erl"},
{line,214}]},
{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}]}]}}ldap_mnesia_23 / ldap_mnesia / dd4a097 internal_mnesia_24 / internal_mnesia / dd4a097 pgsql_mnesia_24 / pgsql_mnesia / dd4a097 pgsql_mnesia_23 / pgsql_mnesia / dd4a097 elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / dd4a097 sm_SUITE:parallel_unacknowledged_message_hook:unacknowledged_message_hook_bounce{error,
{{assertion_failed,assert,is_chat_message,
[<<"msg-1">>],
{xmlel,<<"message">>,
[{<<"from">>,
<<"bOb_unacknowledged_message_hook_bounce_1602@localhost/escalus-default-resource">>},
{<<"to">>,
<<"alicE_unacknowledged_message_hook_bounce_1606@localhost">>},
{<<"xml:lang">>,<<"en">>},
{<<"type">>,<<"chat">>}],
[{xmlel,<<"body">>,[],[{xmlcdata,<<"msg-3">>}]},
{xmlel,<<"delay">>,
[{<<"xmlns">>,<<"urn:xmpp:delay">>},
{<<"stamp">>,<<"2022-03-25T16:01:41.228606Z">>},
{<<"from">>,<<"localhost">>}],
[{xmlcdata,<<"SM Storage">>}]}]},
"<message from='bOb_unacknowledged_message_hook_bounce_1602@localhost/escalus-default-resource' to='alicE_unacknowledged_message_hook_bounce_1606@localhost' xml:lang='en' type='chat'><body>msg-3</body><delay xmlns='urn:xmpp:delay' stamp='2022-03-25T16:01:41.228606Z' from='localhost'>SM Storage</delay></message>"},
[{escalus_new_assert,assert_true,2,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
{line,84}]},
{sm_SUITE,unacknowledged_message_hook_common,2,
[{file,"/home/circleci/project/big_tests/tests/sm_SUITE.erl"},
{line,805}]},
{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,"tes...mysql_redis_24 / mysql_redis / dd4a097 mssql_mnesia_24 / odbc_mssql_mnesia / dd4a097 riak_mnesia_24 / riak_mnesia / dd4a097 |
chrzaszcz
force-pushed
the
mod_event_pusher-map
branch
from
dd4a097 to
04cf562
Compare
|
small_tests_24 / small_tests / 04cf562 small_tests_23 / small_tests / 04cf562 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 04cf562 dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 04cf562 dynamic_domains_mysql_redis_24 / mysql_redis / 04cf562 dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 04cf562 ldap_mnesia_24 / ldap_mnesia / 04cf562 ldap_mnesia_23 / ldap_mnesia / 04cf562 internal_mnesia_24 / internal_mnesia / 04cf562 pgsql_mnesia_24 / pgsql_mnesia / 04cf562 pgsql_mnesia_23 / pgsql_mnesia / 04cf562 elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 04cf562 mysql_redis_24 / mysql_redis / 04cf562 mssql_mnesia_24 / odbc_mssql_mnesia / 04cf562 riak_mnesia_24 / riak_mnesia / 04cf562 |
Use maps with defaults for
mod_event_pusheroptions and introduce host types to the code.Other changes:
backendsubsection was removed, because it did not introduce any value.backendis now reported separately bymod_event_pusher_pushinconfig_metrics(for clarity)Bug fixes
handlerssubsection was added forhttpto allow specifying multiple handlers - this was described in the docs, but not configurable. Big tests had lists that were impossible to get from TOML.event_pusherhas to handlefilter_local_packetbeforeinbox. Having the same priority for both made the result unpredictable and it was possible to make the tests fail by changing the order in which modules were started (wrongunread_count).Left for the future (out of scope for now)
wpooltests for outgoing pools.Details in commit messages.