这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Dec 10, 2021. It is now read-only.

Update tests #131

Merged
merged 1 commit into from
Jun 12, 2020
Merged

Update tests #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ var (
return err
}

grpcServer, err := server.NewGRPCServer(grpcAddress, raftServer, certificateFile, keyFile, commonName, logger)
grpcServer, err := server.NewGRPCServerWithTLS(grpcAddress, raftServer, certificateFile, keyFile, commonName, logger)
if err != nil {
return err
}
Expand Down
6 changes: 5 additions & 1 deletion server/grpc_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ type GRPCServer struct {
logger *zap.Logger
}

func NewGRPCServer(grpcAddress string, raftServer *RaftServer, certificateFile string, keyFile string, commonName string, logger *zap.Logger) (*GRPCServer, error) {
func NewGRPCServer(grpcAddress string, raftServer *RaftServer, logger *zap.Logger) (*GRPCServer, error) {
return NewGRPCServerWithTLS(grpcAddress, raftServer, "", "", "", logger)
}

func NewGRPCServerWithTLS(grpcAddress string, raftServer *RaftServer, certificateFile string, keyFile string, commonName string, logger *zap.Logger) (*GRPCServer, error) {
grpcLogger := logger.Named("grpc")

opts := []grpc.ServerOption{
Expand Down
17 changes: 8 additions & 9 deletions server/grpc_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,21 @@ func Test_GRPCServer_Start_Stop(t *testing.T) {

logger := log.NewLogger("WARN", "", 500, 3, 30, false)

// Raft server
rafAddress := fmt.Sprintf(":%d", util.TmpPort())
raftAddress := fmt.Sprintf(":%d", util.TmpPort())
grpcAddress := fmt.Sprintf(":%d", util.TmpPort())

dir := util.TmpDir()
defer func() {
_ = os.RemoveAll(dir)
}()

indexMapping, err := mapping.NewIndexMappingFromFile(filepath.Join(curDir, "../examples/example_mapping.json"))
if err != nil {
t.Fatalf("%v", err)
}
raftServer, err := NewRaftServer("node1", rafAddress, dir, indexMapping, true, logger)

// Raft server
raftServer, err := NewRaftServer("node1", raftAddress, dir, indexMapping, true, logger)
if err != nil {
t.Fatalf("%v", err)
}
Expand All @@ -49,12 +53,7 @@ func Test_GRPCServer_Start_Stop(t *testing.T) {
}

// gRPC server
grpcAddress := fmt.Sprintf(":%d", util.TmpPort())
certificateFile := ""
keyFile := ""
commonName := ""

grpcServer, err := NewGRPCServer(grpcAddress, raftServer, certificateFile, keyFile, commonName, logger)
grpcServer, err := NewGRPCServer(grpcAddress, raftServer, logger)
if err != nil {
t.Fatalf("%v", err)
}
Expand Down
Loading