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

Add error handling for server startup #28

Merged
merged 1 commit into from
Mar 15, 2019
Merged

Add error handling for server startup #28

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
5 changes: 4 additions & 1 deletion cmd/blast-index/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ func execStart(c *cli.Context) error {
httpAccessLogCompress,
)

svr := index.NewServer(nodeId, bindAddr, grpcAddr, httpAddr, dataDir, joinAddr, indexMappingFile, logger, httpAccessLogger)
svr, err := index.NewServer(nodeId, bindAddr, grpcAddr, httpAddr, dataDir, joinAddr, indexMappingFile, logger, httpAccessLogger)
if err != nil {
return err
}

quitCh := make(chan os.Signal, 1)
signal.Notify(quitCh, os.Kill, os.Interrupt, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
Expand Down
31 changes: 11 additions & 20 deletions index/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type Server struct {
httpLogger *log.Logger
}

func NewServer(nodeId string, bindAddr string, grpcAddr string, httpAddr string, dataDir string, joinAddr string, indexMappingPath string, logger *log.Logger, httpLogger *log.Logger) *Server {
func NewServer(nodeId string, bindAddr string, grpcAddr string, httpAddr string, dataDir string, joinAddr string, indexMappingPath string, logger *log.Logger, httpLogger *log.Logger) (*Server, error) {
var err error

server := &Server{
Expand All @@ -61,8 +61,7 @@ func NewServer(nodeId string, bindAddr string, grpcAddr string, httpAddr string,
// read index mapping file
indexMappingFile, err := os.Open(indexMappingPath)
if err != nil {
server.logger.Printf("[ERR] %v", err)
return nil
return nil, err
}
defer func() {
err = indexMappingFile.Close()
Expand All @@ -73,18 +72,15 @@ func NewServer(nodeId string, bindAddr string, grpcAddr string, httpAddr string,

b, err := ioutil.ReadAll(indexMappingFile)
if err != nil {
server.logger.Printf("[ERR] %v", err)
return nil
return nil, err
}

err = json.Unmarshal(b, indexMapping)
if err != nil {
server.logger.Printf("[ERR] %v", err)
return nil
return nil, err
}
} else if os.IsNotExist(err) {
server.logger.Printf("[ERR] %v", err)
return nil
return nil, err
}
}

Expand All @@ -100,39 +96,34 @@ func NewServer(nodeId string, bindAddr string, grpcAddr string, httpAddr string,
// create raft server
server.raftServer, err = NewRaftServer(server.node, server.bootstrap, indexMapping, server.logger)
if err != nil {
server.logger.Printf("[ERR] %v", err)
return nil
return nil, err
}

// create gRPC service
server.grpcService, err = NewGRPCService(server.raftServer, server.logger)
if err != nil {
server.logger.Printf("[ERR] %v", err)
return nil
return nil, err
}

// create gRPC server
server.grpcServer, err = NewGRPCServer(grpcAddr, server.grpcService, server.logger)
if err != nil {
server.logger.Printf("[ERR] %v", err)
return nil
return nil, err
}

// create gRPC client for HTTP server
server.grpcClient, err = NewGRPCClient(grpcAddr)
if err != nil {
server.logger.Printf("[ERR] %v", err)
return nil
return nil, err
}

// create HTTP server
server.httpServer, err = NewHTTPServer(httpAddr, server.grpcClient, server.logger, server.httpLogger)
if err != nil {
server.logger.Printf("[ERR] %v", err)
return nil
return nil, err
}

return server
return server, nil
}

func (s *Server) Start() {
Expand Down