feat: support Consul as ServiceRegistry #695
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
size/XL
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #695 +/- ##
==========================================
+ Coverage 88.14% 88.36% +0.22%
==========================================
Files 119 119
Lines 5837 5941 +104
==========================================
+ Hits 5145 5250 +105
+ Misses 500 493 -7
- Partials 192 198 +6 ☔ View full report in Codecov by Sentry. |
lyt122
force-pushed
the
main
branch
2 times, most recently
from
7909392
to
6bc3642
Compare
feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry feat: add consul as serviceRegistry
spacewander
reviewed
Aug 26, 2024
|
|
||
| service := map[string]any{ | ||
| "Node": "node1", // 指定节点名称 | ||
| "Address": ip, // 节点IP地址 |
|
|
||
| serviceID := name + ip + port | ||
| body := map[string]any{ | ||
| "Node": "node1", // 指定节点名称 |
| @@ -17,6 +17,23 @@ services: | |||
| - "8849:8848" | |||
| networks: | |||
| service: | |||
| consul: | |||
| image: docker.m.daocloud.io/library/consul:1.10.8 | |||
There was a problem hiding this comment.
Could we use the latest image (1.15.4)?
| if err != nil { | ||
| reg.logger.Errorf("failed to subscribe service, err: %v, service: %v", err, service.ServiceName) | ||
| delete(serviceMap, service) | ||
| delete(reg.watchingServices, service) |
There was a problem hiding this comment.
We don't need to delete service from reg.watchingServices if _, ok := reg.watchingServices[service]; !ok
| var host string | ||
| suffix := strings.Join([]string{reg.client.NameSpace, reg.client.DataCenter, reg.name, RegistryType}, ".") | ||
| suffix = strings.ReplaceAll(suffix, "_", "-") | ||
| if len(tag) > 0 { |
There was a problem hiding this comment.
Join an empty string is harmless as we will remove the repeated dots below. We can remove an extra branch.
spacewander
approved these changes
Aug 27, 2024
| name: "test_registry", | ||
| } | ||
|
|
||
| // 测试用例 |
|
Merged. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ref #259