diff options
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/master.go | 4 | ||||
| -rw-r--r-- | weed/command/server.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/weed/command/master.go b/weed/command/master.go index 16e343f77..8abec2a3d 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -9,7 +9,7 @@ import ( "time" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/pb" + "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/server" "github.com/chrislusf/seaweedfs/weed/util" "github.com/gorilla/mux" @@ -104,7 +104,7 @@ func runMaster(cmd *Command, args []string) bool { // Create your protocol servers. grpcS := grpc.NewServer() - pb.RegisterSeaweedServer(grpcS, ms) + master_pb.RegisterSeaweedServer(grpcS, ms) reflection.Register(grpcS) httpS := &http.Server{Handler: r} diff --git a/weed/command/server.go b/weed/command/server.go index 626bc0855..2425532ac 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -11,7 +11,7 @@ import ( "time" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/pb" + "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/server" "github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/util" @@ -226,7 +226,7 @@ func runServer(cmd *Command, args []string) bool { // Create your protocol servers. grpcS := grpc.NewServer() - pb.RegisterSeaweedServer(grpcS, ms) + master_pb.RegisterSeaweedServer(grpcS, ms) reflection.Register(grpcS) httpS := &http.Server{Handler: r} |