Merge branch 'master' of https://github.com/chrislusf/seaweedfs

weed/server/master_grpc_server.go

@@ -102,14 +102,15 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ
 
 		// tell the volume servers about the leader
 		newLeader, err := t.Leader()
-		if err == nil {
+		if err != nil {
+			return err
+		}
 		if err := stream.Send(&master_pb.HeartbeatResponse{
 			Leader: newLeader,
 		}); err != nil {
 			return err
 		}
 	}
-	}
 }
 
 // KeepConnected keep a stream gRPC call to the master. Used by clients to know the master is up.