Upgrade jsonrpc.Service's bootstrap workflow

ggicci · ggicci · commit 3eeffbe3bb93 · 2019-01-07T00:35:17.000+08:00
1. add StopServersAndWait to Service instance;
2. export api.models.OpenSQLiteDBAsGorp function for convenient use;
3. update cqld's bootstrap.
diff --git a/api/models/models.go b/api/models/models.go
@@ -18,16 +18,32 @@ func InitModels(dbFile string) error {
 	return initChainDBConnection(dbFile)
 }
 
-func initChainDBConnection(dbFile string) error {
-	dsn := fmt.Sprintf("%s?_journal=WAL&mode=ro", dbFile)
+// OpenSQLiteDBAsGorp opens a sqlite database an wrapped it in gorp.DbMap.
+func OpenSQLiteDBAsGorp(dbFile, mode string, maxOpen, maxIdle int) (db *gorp.DbMap, err error) {
+	dsn := fmt.Sprintf("%s?_journal=WAL&mode=%s", dbFile, mode)
 	underdb, err := sql.Open("sqlite3", dsn)
 	if err != nil {
-		return errors.WithMessage(err, "unable to open chain.db")
+		return nil, errors.Wrapf(err, "unable to open database %q", dsn)
 	}
-	chaindb = &gorp.DbMap{
+	underdb.SetMaxOpenConns(maxOpen)
+	underdb.SetMaxIdleConns(maxIdle)
+
+	if err := underdb.Ping(); err != nil {
+		return nil, errors.Wrapf(err, "ping to database %q failed", dsn)
+	}
+
+	db = &gorp.DbMap{
 		Db:      underdb,
 		Dialect: gorp.SqliteDialect{},
 	}
+	return db, nil
+}
+
+func initChainDBConnection(dbFile string) (err error) {
+	chaindb, err = OpenSQLiteDBAsGorp(dbFile, "ro", 100, 30)
+	if err != nil {
+		return err
+	}
 
 	// register tables
 	chaindb.AddTableWithName(Block{}, "indexed_blocks").SetKeys(false, "Height")
diff --git a/api/service.go b/api/service.go
@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/CovenantSQL/CovenantSQL/api/models"
-
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
@@ -27,6 +26,15 @@ type Service struct {
 	WriteTimeout  time.Duration
 
 	stopChan chan struct{}
+	stopped  chan struct{}
+}
+
+// NewService creates a new Service.
+func NewService() *Service {
+	return &Service{
+		stopChan: make(chan struct{}),
+		stopped:  make(chan struct{}),
+	}
 }
 
 // StartServers start API servers in a non-blocking way, fatal on errors.
@@ -39,15 +47,19 @@ func (s *Service) StopServers() {
 	close(s.stopChan)
 }
 
+// StopServersAndWait wait servers to stop.
+func (s *Service) StopServersAndWait() {
+	s.StopServers()
+	<-s.stopped
+}
+
 // RunServers start API servers in a blocking way, fatal on errors.
 func (s *Service) RunServers() {
 	// setup database
 	if err := models.InitModels(s.DBFile); err != nil {
 		log.WithError(err).Fatal("api: init models failed")
 		return
 	}
-
-	s.stopChan = make(chan struct{})
 	wg := sync.WaitGroup{}
 
 	if s.WebsocketAddr != "" {
@@ -119,4 +131,5 @@ func (s *Service) runWebsocketServer(wg *sync.WaitGroup) {
 	}
 	cancel()
 	log.Warn("api: websocket server stopped")
+	close(s.stopped)
 }
diff --git a/cmd/cqld/bootstrap.go b/cmd/cqld/bootstrap.go
@@ -159,12 +159,11 @@ func runNode(nodeID proto.NodeID, listenAddr string) (err error) {
 
 	// start json-rpc server
 	if wsapiAddr != "" {
-		jsonrpcServer := &api.Service{
-			DBFile:        conf.GConf.BP.ChainFileName,
-			WebsocketAddr: wsapiAddr,
-			ReadTimeout:   60 * time.Second,
-			WriteTimeout:  60 * time.Second,
-		}
+		jsonrpcServer := api.NewService()
+		jsonrpcServer.DBFile = conf.GConf.BP.ChainFileName
+		jsonrpcServer.WebsocketAddr = wsapiAddr
+		jsonrpcServer.ReadTimeout = 60 * time.Second
+		jsonrpcServer.WriteTimeout = 60 * time.Second
 		jsonrpcServer.StartServers()
 	}
 
