Skip to content

sync from nanonng#210

Merged
JaylinYu merged 12 commits into
mainfrom
wayne/dev
Dec 28, 2023
Merged

sync from nanonng#210
JaylinYu merged 12 commits into
mainfrom
wayne/dev

Conversation

@StargazerWayne

@StargazerWayne StargazerWayne commented Dec 22, 2023

Copy link
Copy Markdown

No description provided.

@codecov

codecov Bot commented Dec 22, 2023 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Attention: 66 lines in your changes are missing coverage. Please review.

Comparison is base (13c3e14) 59.02% compared to head (f4b5b9a) 58.92%.

❗ Current head f4b5b9a differs from pull request most recent head 3b464bd. Consider uploading reports for the commit 3b464bd to get more accurate results

Files Patch % Lines
src/mqtt/protocol/mqtt/mqtt_client.c 0.00% 15 Missing ⚠️
src/mqtt/protocol/mqtt/mqttv5_client.c 0.00% 15 Missing ⚠️
src/mqtt/transport/tls/mqtt_tls.c 0.00% 15 Missing ⚠️
src/supplemental/websocket/websocket.c 83.33% 4 Missing ⚠️
src/supplemental/http/http_server.c 80.00% 3 Missing ⚠️
src/mqtt/transport/tcp/mqtt_tcp.c 0.00% 2 Missing ⚠️
src/sp/transport/inproc/inproc.c 0.00% 2 Missing ⚠️
src/sp/transport/ipc/ipc.c 0.00% 2 Missing ⚠️
src/sp/transport/tcp/tcp.c 0.00% 2 Missing ⚠️
src/sp/transport/tls/tls.c 0.00% 2 Missing ⚠️
... and 3 more
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #210      +/-   ##
==========================================
- Coverage   59.02%   58.92%   -0.11%     
==========================================
  Files          95       95              
  Lines       26483    26524      +41     
==========================================
- Hits        15632    15629       -3     
- Misses      10851    10895      +44

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@StargazerWayne StargazerWayne changed the title WIP sync from nanonng [WIP} sync from nanonng Dec 22, 2023
@StargazerWayne StargazerWayne changed the title [WIP} sync from nanonng [WIP] sync from nanonng Dec 22, 2023
@JaylinYu JaylinYu marked this pull request as draft December 24, 2023 12:52
@StargazerWayne StargazerWayne force-pushed the wayne/dev branch 4 times, most recently from 11bafde to c0fba12 Compare December 27, 2023 13:06
@StargazerWayne StargazerWayne marked this pull request as ready for review December 27, 2023 13:12
@StargazerWayne StargazerWayne changed the title [WIP] sync from nanonng sync from nanonng Dec 27, 2023
@StargazerWayne StargazerWayne mentioned this pull request Dec 28, 2023
Merged
@JaylinYu

JaylinYu commented Dec 28, 2023

Copy link
Copy Markdown
Member

.... better to keep history the same

JaylinYu
JaylinYu previously approved these changes Dec 28, 2023
View reviewed changes

@JaylinYu JaylinYu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a long tedius merging

gdamore and others added 12 commits December 28, 2023 22:45
@gdamore @JaylinYu
minor tweaks to REAMDE
4b63d8a
@JaylinYu
* SYNC [transport/protocol] enhance ACK
4bf7c43 
Signed-off-by: wayne <yukang.wei@emqx.io>
@JaylinYu
* MDF [transport] reduce backoff starting time to 0-1s
b290893 
Signed-off-by: wayne <yukang.wei@emqx.io>
@JaylinYu
* ADD [tcpconn] add TCP params via setsockopt
2014960 
Signed-off-by: wayne <yukang.wei@emqx.io>
@JaylinYu
* MDF [nn] sync nn
db400bd 
Signed-off-by: wayne <yukang.wei@emqx.io>
Signed-off-by: jaylin <jaylin@emqx.io>
@JaylinYu
* SYNC [core/sp] sync nng (actually not needed)
6ff375d 
Signed-off-by: wayne <yukang.wei@emqx.io>
Signed-off-by: jaylin <jaylin@emqx.io>
@JaylinYu
* FIX [header] fix warning in darwin
93c0670 
Signed-off-by: wayne <yukang.wei@emqx.io>
@JaylinYu
* FIX [posix_tcpconn] revert change
d90fd53 
Signed-off-by: wayne <yukang.wei@emqx.io>
@JaylinYu
* NEW [mqtts/trans] add set reconnect backoff interface
8c9af32 
Signed-off-by: wayne <yukang.wei@emqx.io>
@JaylinYu
* FIX [mqtt_tls] log fix
38101aa 
Signed-off-by: wayne <yukang.wei@emqx.io>
@JaylinYu
* SYNC [docs] nanonng docs sync
9eaf94a 
Signed-off-by: wayne <yukang.wei@emqx.io>
Signed-off-by: jaylin <jaylin@emqx.io>
@JaylinYu
* SYNC [core] nanonng sync
3b464bd 
* MDF Fix conlficts
Signed-off-by: wayne <yukang.wei@emqx.io>
Signed-off-by: jaylin <jaylin@emqx.io>
@JaylinYu JaylinYu dismissed their stale review December 28, 2023 14:45

The merge-base changed after approval.

JaylinYu
JaylinYu approved these changes Dec 28, 2023
View reviewed changes

@JaylinYu JaylinYu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tedius

@JaylinYu JaylinYu merged commit 47f4552 into main Dec 28, 2023
@JaylinYu JaylinYu deleted the wayne/dev branch December 28, 2023 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JaylinYu JaylinYu JaylinYu approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@StargazerWayne @JaylinYu @gdamore