From 6f75df8660a48a9f3cef8498208d2a070f868a94 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 10 Aug 2019 03:09:42 -0700 Subject: [PATCH] server: fix starting default master list --- weed/command/server.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/weed/command/server.go b/weed/command/server.go index 1c6439edc..87f404ed3 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -121,13 +121,17 @@ func runServer(cmd *Command, args []string) bool { *isStartingFiler = true } + _, peerList := checkPeers(*serverIp, *masterOptions.port, *masterOptions.peers) + peers := strings.Join(peerList, ",") + masterOptions.peers = &peers + masterOptions.ip = serverIp masterOptions.ipBind = serverBindIp - filerOptions.masters = masterOptions.peers + filerOptions.masters = &peers filerOptions.ip = serverBindIp serverOptions.v.ip = serverIp serverOptions.v.bindIp = serverBindIp - serverOptions.v.masters = masterOptions.peers + serverOptions.v.masters = &peers serverOptions.v.idleConnectionTimeout = serverTimeout serverOptions.v.dataCenter = serverDataCenter serverOptions.v.rack = serverRack