change server address from string to a type

1 files changed, 4 insertions, 45 deletions

diff --git a/weed/operation/grpc_client.go b/weed/operation/grpc_client.go
index 39f70343a..743682203 100644
--- a/weed/operation/grpc_client.go
+++ b/weed/operation/grpc_client.go
@@ -1,68 +1,27 @@
 package operation
 
 import (
-	"fmt"
-	"github.com/chrislusf/seaweedfs/weed/util"
-	"strconv"
-	"strings"
-
 	"google.golang.org/grpc"
 
-	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/pb"
-	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 	"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
 	"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
 )
 
-func WithVolumeServerClient(volumeServer string, grpcDialOption grpc.DialOption, fn func(volume_server_pb.VolumeServerClient) error) error {
-
-	grpcAddress, err := toVolumeServerGrpcAddress(volumeServer)
-	if err != nil {
-		return fmt.Errorf("failed to parse volume server %v: %v", volumeServer, err)
-	}
+func WithVolumeServerClient(volumeServer pb.ServerAddress, grpcDialOption grpc.DialOption, fn func(volume_server_pb.VolumeServerClient) error) error {
 
 	return pb.WithCachedGrpcClient(func(grpcConnection *grpc.ClientConn) error {
 		client := volume_server_pb.NewVolumeServerClient(grpcConnection)
 		return fn(client)
-	}, grpcAddress, grpcDialOption)
-
-}
+	}, volumeServer.ToGrpcAddress(), grpcDialOption)
 
-func toVolumeServerGrpcAddress(volumeServer string) (grpcAddress string, err error) {
-	sepIndex := strings.LastIndex(volumeServer, ":")
-	port, err := strconv.Atoi(volumeServer[sepIndex+1:])
-	if err != nil {
-		glog.Errorf("failed to parse volume server address: %v", volumeServer)
-		return "", err
-	}
-	return util.JoinHostPort(volumeServer[0:sepIndex], port+10000), nil
 }
 
-func WithMasterServerClient(masterServer string, grpcDialOption grpc.DialOption, fn func(masterClient master_pb.SeaweedClient) error) error {
-
-	masterGrpcAddress, parseErr := pb.ParseServerToGrpcAddress(masterServer)
-	if parseErr != nil {
-		return fmt.Errorf("failed to parse master %v: %v", masterServer, parseErr)
-	}
+func WithMasterServerClient(masterServer pb.ServerAddress, grpcDialOption grpc.DialOption, fn func(masterClient master_pb.SeaweedClient) error) error {
 
 	return pb.WithCachedGrpcClient(func(grpcConnection *grpc.ClientConn) error {
 		client := master_pb.NewSeaweedClient(grpcConnection)
 		return fn(client)
-	}, masterGrpcAddress, grpcDialOption)
-
-}
-
-func WithFilerServerClient(filerServer string, grpcDialOption grpc.DialOption, fn func(masterClient filer_pb.SeaweedFilerClient) error) error {
-
-	filerGrpcAddress, parseErr := pb.ParseServerToGrpcAddress(filerServer)
-	if parseErr != nil {
-		return fmt.Errorf("failed to parse filer %v: %v", filerGrpcAddress, parseErr)
-	}
-
-	return pb.WithCachedGrpcClient(func(grpcConnection *grpc.ClientConn) error {
-		client := filer_pb.NewSeaweedFilerClient(grpcConnection)
-		return fn(client)
-	}, filerGrpcAddress, grpcDialOption)
+	}, masterServer.ToGrpcAddress(), grpcDialOption)
 
 }