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.

Sign up for GitHub

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

feature-graceful-shutdwon #1675

Merged
merged 17 commits into from
Jan 17, 2022
Merged

feature-graceful-shutdwon #1675

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
41d1203
优雅下线
XiaoWeiKIN Dec 19, 2021
5759c77
优雅下线
XiaoWeiKIN Dec 26, 2021
9b7b897
unit test add
XiaoWeiKIN Dec 26, 2021
941351d
add test
XiaoWeiKIN Dec 26, 2021
da25c24
import format
XiaoWeiKIN Dec 26, 2021
e879126
Fix: import formatter
LaurenceLiZhixin Jan 5, 2022
272d18a
Merge remote-tracking branch 'upstream/3.0' into graceful-shutdown
LaurenceLiZhixin Jan 5, 2022
e2ff2ec
Fix: license
LaurenceLiZhixin Jan 5, 2022
3dd5c1f
invoker
Jan 5, 2022
5b8939e
invoker
Jan 5, 2022
6d6a61a
fix: ut
LaurenceLiZhixin Jan 7, 2022
97fb3d5
ftr: finish graceful shugdown
LaurenceLiZhixin Jan 16, 2022
0a137fd
fix: update triple
LaurenceLiZhixin Jan 16, 2022
6d34c66
fix: add nolint
LaurenceLiZhixin Jan 16, 2022
c95f80d
Merge remote-tracking branch 'upstream/3.0' into graceful-shutdown
LaurenceLiZhixin Jan 16, 2022
e8677d1
fix: lint
LaurenceLiZhixin Jan 16, 2022
39916bb
fix: ut
LaurenceLiZhixin Jan 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: update triple
  • Loading branch information
@LaurenceLiZhixin
LaurenceLiZhixin committed Jan 16, 2022
commit 0a137fd2d91f1f698b510c397eea5d4cfd601f74
5 changes: 2 additions & 3 deletions common/constant/default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ const (
// that put the AdaptiveServiceProviderFilterKey at the end.
DefaultServiceFilters = EchoFilterKey + "," +
MetricsFilterKey + "," + TokenFilterKey + "," + AccessLogFilterKey + "," + TpsLimitFilterKey + "," +
GenericServiceFilterKey + "," + ExecuteLimitFilterKey + "," + GracefulShutdownProviderFilterKey
//+ "," +
// AdaptiveServiceProviderFilterKey
GenericServiceFilterKey + "," + ExecuteLimitFilterKey + "," + GracefulShutdownProviderFilterKey + "," +
AdaptiveServiceProviderFilterKey

DefaultReferenceFilters = GracefulShutdownConsumerFilterKey
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/dubbogo/go-zookeeper v1.0.4-0.20211212162352-f9d2183d89d5
github.com/dubbogo/gost v1.11.22
github.com/dubbogo/grpc-go v1.42.7
github.com/dubbogo/triple v1.1.7
github.com/dubbogo/triple v1.1.8-rc2
github.com/emicklei/go-restful/v3 v3.7.3
github.com/fsnotify/fsnotify v1.5.1
github.com/ghodss/yaml v1.0.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ github.com/dubbogo/grpc-go v1.42.7/go.mod h1:F1T9hnUvYGW4JLK1QNriavpOkhusU677ovP
github.com/dubbogo/jsonparser v1.0.1/go.mod h1:tYAtpctvSP/tWw4MeelsowSPgXQRVHHWbqL6ynps8jU=
github.com/dubbogo/net v0.0.4/go.mod h1:1CGOnM7X3he+qgGNqjeADuE5vKZQx/eMSeUkpU3ujIc=
github.com/dubbogo/triple v1.0.9/go.mod h1:1t9me4j4CTvNDcsMZy6/OGarbRyAUSY0tFXGXHCp7Iw=
github.com/dubbogo/triple v1.1.7 h1:6KdOUJYwTaCrXtosir2eoQ++JzP5AGy/0zuE4UXZAG4=
github.com/dubbogo/triple v1.1.7/go.mod h1:7IZLmz0sWZuceYM4urzyZemIcqvoksrFq4CZZ8/wBjQ=
github.com/dubbogo/triple v1.1.8-rc2 h1:taPtjwH6J7WeixkoIjufd3mpYc1IESXMpgoH9gzhlw4=
github.com/dubbogo/triple v1.1.8-rc2/go.mod h1:7IZLmz0sWZuceYM4urzyZemIcqvoksrFq4CZZ8/wBjQ=
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
Expand Down