Skip to content

Commit

Permalink
Merge pull request #6881 from kobergj/UsePutForNats
Browse files Browse the repository at this point in the history
Use PUT registry for nats
  • Loading branch information
kobergj authored Jul 26, 2023
2 parents 927a518 + c942c7a commit d8bbe7e
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 12 deletions.
6 changes: 6 additions & 0 deletions changelog/unreleased/fix-nats-registry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Fix nats registry

Using `nats` as service registry did work, but when a service would restart and gets a new ip it couldn't re-register.
We fixed this by using `"put"` register action instead of the default `"create"`

https://github.com/owncloud/ocis/pull/6881
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/go-micro/plugins/v4/registry/kubernetes v1.1.2-0.20230605104008-a179a6b8f8e6
github.com/go-micro/plugins/v4/registry/mdns v1.2.0
github.com/go-micro/plugins/v4/registry/memory v1.2.0
github.com/go-micro/plugins/v4/registry/nats v1.2.1
github.com/go-micro/plugins/v4/registry/nats v1.2.2-0.20230723205323-1ada01245674
github.com/go-micro/plugins/v4/server/grpc v1.2.0
github.com/go-micro/plugins/v4/server/http v1.2.1
github.com/go-micro/plugins/v4/wrapper/breaker/gobreaker v1.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -790,8 +790,8 @@ github.com/go-micro/plugins/v4/registry/mdns v1.2.0 h1:BsGnco+PgycvSX+HS0XbeUQEP
github.com/go-micro/plugins/v4/registry/mdns v1.2.0/go.mod h1:re0JvO5F56n59WEDaAKj2jtboKa2dklAd6iWyz5xa54=
github.com/go-micro/plugins/v4/registry/memory v1.2.0 h1:R0G2tltffuG+fQnk+/JuAdgEJX4J+LuOafZDoNd8ow0=
github.com/go-micro/plugins/v4/registry/memory v1.2.0/go.mod h1:4t5YiXJT5BVtMWImxy807lY3ywjv/PHpdHnN+LXSsI4=
github.com/go-micro/plugins/v4/registry/nats v1.2.1 h1:YsGmSYxhdu9NK7d8NYMY/xhaYMB4AhcCWoSrk7YGdEY=
github.com/go-micro/plugins/v4/registry/nats v1.2.1/go.mod h1:RDsrDhcjJggCzAvvUzo/Bzy68d9s9+tu0KOfofXVCog=
github.com/go-micro/plugins/v4/registry/nats v1.2.2-0.20230723205323-1ada01245674 h1:NBjrNT5TKhKB0ENBGpse+FRCY6GQAeS8LxKrspMKZs0=
github.com/go-micro/plugins/v4/registry/nats v1.2.2-0.20230723205323-1ada01245674/go.mod h1:RDsrDhcjJggCzAvvUzo/Bzy68d9s9+tu0KOfofXVCog=
github.com/go-micro/plugins/v4/server/grpc v1.2.0 h1:lXfM+/0oE/u1g0hVBYsvbP4lYOYXYOmwf5qH7ghi7Cc=
github.com/go-micro/plugins/v4/server/grpc v1.2.0/go.mod h1:+Ah9Pf/vMSXxBM3fup/hc3N+zN2as3nIpcRaR4sBjnY=
github.com/go-micro/plugins/v4/server/http v1.2.1 h1:Cia924J90rgFT/4qWWvyLvN+XqEm5T9tiQyQ+GU4bOQ=
Expand Down
1 change: 1 addition & 0 deletions ocis-pkg/registry/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ func GetRegistry() mRegistry.Registry {
case "nats":
reg = natsr.NewRegistry(
mRegistry.Addrs(addresses...),
natsr.RegisterAction("put"),
)
case "kubernetes":
reg = kubernetesr.NewRegistry(
Expand Down
24 changes: 16 additions & 8 deletions vendor/github.com/go-micro/plugins/v4/registry/nats/nats.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions vendor/github.com/go-micro/plugins/v4/registry/nats/options.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ github.com/go-micro/plugins/v4/registry/mdns
# github.com/go-micro/plugins/v4/registry/memory v1.2.0
## explicit; go 1.17
github.com/go-micro/plugins/v4/registry/memory
# github.com/go-micro/plugins/v4/registry/nats v1.2.1
# github.com/go-micro/plugins/v4/registry/nats v1.2.2-0.20230723205323-1ada01245674
## explicit; go 1.17
github.com/go-micro/plugins/v4/registry/nats
# github.com/go-micro/plugins/v4/server/grpc v1.2.0
Expand Down

0 comments on commit d8bbe7e

Please sign in to comment.