diff options
| author | chrislu <chris.lu@gmail.com> | 2023-09-13 00:03:47 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-09-13 00:03:47 -0700 |
| commit | b771fefa374fe237ff1317bbd03a9297a52191e3 (patch) | |
| tree | 9856be72db18e6ae32523640cd3a9e3ca61fbeeb /weed/command/server.go | |
| parent | 0a851ec00b455c72b405503f6f1f41728b15962e (diff) | |
| parent | 8908810376e671b34262295f1ad558ca43db58c2 (diff) | |
| download | seaweedfs-b771fefa374fe237ff1317bbd03a9297a52191e3.tar.xz seaweedfs-b771fefa374fe237ff1317bbd03a9297a52191e3.zip | |
Merge branch 'master' into sub
Diffstat (limited to 'weed/command/server.go')
| -rw-r--r-- | weed/command/server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/command/server.go b/weed/command/server.go index fecb1cad6..7fbb59676 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -203,7 +203,7 @@ func runServer(cmd *Command, args []string) bool { // ip address masterOptions.ip = serverIp masterOptions.ipBind = serverBindIp - filerOptions.masters = pb.ServerAddresses(*masterOptions.peers).ToAddressMap() + filerOptions.masters = pb.ServerAddresses(*masterOptions.peers).ToServiceDiscovery() filerOptions.ip = serverIp filerOptions.bindIp = serverBindIp s3Options.bindIp = serverBindIp @@ -216,7 +216,7 @@ func runServer(cmd *Command, args []string) bool { serverOptions.v.dataCenter = serverDataCenter serverOptions.v.rack = serverRack mqBrokerOptions.ip = serverIp - mqBrokerOptions.masters = filerOptions.masters + mqBrokerOptions.masters = filerOptions.masters.GetInstancesAsMap() mqBrokerOptions.filerGroup = filerOptions.filerGroup // serverOptions.v.pulseSeconds = pulseSeconds |