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

Introduce new bridge impl #2199

Merged
merged 27 commits into from Feb 28, 2019

Conversation

@spring2maz
Copy link
Contributor

spring2maz commented Jan 30, 2019

NOTE: This is still a work-in-progress PR.

@coveralls

This comment has been minimized.

Copy link

coveralls commented Jan 30, 2019

Pull Request Test Coverage Report for Build 4867

  • 275 of 354 (77.68%) changed or added relevant lines in 9 files are covered.
  • 22 unchanged lines in 5 files lost coverage.
  • Overall coverage increased (+2.03%) to 70.373%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/emqx_portal_connect.erl 9 11 81.82%
src/emqx_topic.erl 7 9 77.78%
src/portal/emqx_portal_msg.erl 8 10 80.0%
src/emqx_client.erl 27 32 84.38%
src/portal/emqx_portal_sup.erl 7 13 53.85%
src/portal/emqx_portal_rpc.erl 23 32 71.88%
src/portal/emqx_portal_mqtt.erl 52 66 78.79%
src/portal/emqx_portal.erl 141 180 78.33%
Files with Coverage Reduction New Missed Lines %
src/emqx_session.erl 1 70.45%
src/emqx_logger.erl 2 43.18%
src/emqx_metrics.erl 2 80.23%
src/emqx_protocol.erl 6 76.43%
src/emqx_client.erl 11 58.64%
Totals Coverage Status
Change from base Build 4860: 2.03%
Covered Lines: 3456
Relevant Lines: 4911

💛 - Coveralls
@spring2maz spring2maz force-pushed the introduce-new-bridge-impl branch 3 times, most recently from dbf388d to d866a97 Feb 6, 2019
@spring2maz spring2maz force-pushed the introduce-new-bridge-impl branch from 2acc074 to a381c61 Feb 15, 2019
etc/emqx.conf Outdated Show resolved Hide resolved
src/emqx_portal_connect.erl Outdated Show resolved Hide resolved
priv/emqx.schema Outdated Show resolved Hide resolved
@spring2maz spring2maz force-pushed the introduce-new-bridge-impl branch from f14f7fe to 4b40e99 Feb 19, 2019
@spring2maz spring2maz changed the base branch from testing to develop Feb 19, 2019
@spring2maz spring2maz force-pushed the introduce-new-bridge-impl branch from 9dfdf5f to 8d552ca Feb 20, 2019
@gilbertwong96 gilbertwong96 force-pushed the introduce-new-bridge-impl branch 5 times, most recently from ce3a504 to 3aa7cbe Feb 25, 2019
@spring2maz spring2maz force-pushed the introduce-new-bridge-impl branch 2 times, most recently from 80c53c7 to e363546 Feb 26, 2019
include/emqx_client.hrl Outdated Show resolved Hide resolved
src/emqx_portal_connect.erl Outdated Show resolved Hide resolved
@gilbertwong96 gilbertwong96 force-pushed the introduce-new-bridge-impl branch from 0307f36 to 0fd689b Feb 27, 2019
@gilbertwong96 gilbertwong96 requested a review from emqplus Feb 27, 2019
spring2maz added 6 commits Jan 14, 2019
In this commit, msg_handler option is added to emqx_client.
so the caller can provide callbacks to handle puback, publish,
as well as disconnected events instead of always delivered
as message like Owner ! {publish, Msg} to the owner process.

This is to make it ready to implement emqx_portal_connect on
top of emqx_client.
also cover emqx_portal_mqtt with CT
@gilbertwong96 gilbertwong96 force-pushed the introduce-new-bridge-impl branch from cfc9b8f to d18f4ba Feb 28, 2019
Gilbert
Makefile Outdated
@@ -35,7 +35,7 @@ CT_SUITES = emqx emqx_client emqx_zone emqx_banned emqx_session \
emqx_keepalive emqx_lib emqx_metrics emqx_mod emqx_mod_sup emqx_mqtt_caps \
emqx_mqtt_props emqx_mqueue emqx_net emqx_pqueue emqx_router emqx_sm \
emqx_tables emqx_time emqx_topic emqx_trie emqx_vm emqx_mountpoint \
emqx_listeners emqx_protocol emqx_pool emqx_shared_sub emqx_bridge \
emqx_listeners emqx_protocol emqx_pool emqx_shared_sub emqx_portal \

This comment has been minimized.

Copy link
@gilbertwong96

gilbertwong96 Feb 28, 2019

Contributor

Use bridge rather portal

when (QoS =:= ?QOS_1); (QoS =:= ?QOS_2) ->
case emqx_inflight:is_full(Inflight) of
true ->
when (QoS =:= ?QOS_1); (QoS =:= ?QOS_2) ->

This comment has been minimized.

Copy link
@gilbertwong96

gilbertwong96 Feb 28, 2019

Contributor

Typo problem.

src/portal/emqx_portal.erl Outdated Show resolved Hide resolved
src/portal/emqx_portal.erl Outdated Show resolved Hide resolved
@gilbertwong96 gilbertwong96 merged commit ebc442b into develop Feb 28, 2019
0 of 2 checks passed
0 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/travis-ci/push The Travis CI build failed
Details
@gilbertwong96 gilbertwong96 deleted the introduce-new-bridge-impl branch Feb 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.