Fix bin/cql -web and -dsn flag interference

Qi Xiao · Qi Xiao · commit 6bf90a58426e · 2019-02-26T21:54:30.000+08:00
diff --git a/cmd/cql-observer/main.go b/cmd/cql-observer/main.go
@@ -77,6 +77,10 @@ func main() {
 	}
 	kms.InitBP()
 
+	if err = initNode(); err != nil {
+		return
+	}
+
 	service, httpServer, err := observer.StartObserver(listenAddr, version)
 	if err != nil {
 		log.WithError(err).Fatal("start observer failed")
diff --git a/cmd/cql-observer/node.go b/cmd/cql-observer/node.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 The CovenantSQL Authors.
+ * Copyright 2019 The CovenantSQL Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package observer
+package main
 
 import (
 	"fmt"
diff --git a/cmd/cql/main.go b/cmd/cql/main.go
@@ -292,13 +292,14 @@ func main() {
 
 	configFile = utils.HomeDirExpand(configFile)
 
-	if explorerAddr != "" {
-		var err error
-		conf.GConf, err = conf.LoadConfig(configFile)
-		if err != nil {
-			log.WithField("config", configFile).WithError(err).Fatal("load config failed")
-		}
+	// init covenantsql driver
+	if err = client.Init(configFile, []byte(password)); err != nil {
+		cLog.WithError(err).Error("init covenantsql client failed")
+		os.Exit(-1)
+		return
+	}
 
+	if explorerAddr != "" {
 		service, httpServer, err = observer.StartObserver(explorerAddr, version)
 		if err != nil {
 			log.WithError(err).Fatal("start explorer failed")
@@ -312,13 +313,6 @@ func main() {
 			_ = observer.StopObserver(service, httpServer)
 			log.Info("explorer stopped")
 		}()
-	} else {
-		// init covenantsql driver
-		if err = client.Init(configFile, []byte(password)); err != nil {
-			cLog.WithError(err).Error("init covenantsql client failed")
-			os.Exit(-1)
-			return
-		}
 	}
 
 	// TODO(leventeliu): discover more specific confirmation duration from config. We don't have
diff --git a/sqlchain/observer/observer.go b/sqlchain/observer/observer.go
@@ -63,11 +63,6 @@ func stopService(service *Service) (err error) {
 
 // StartObserver starts the observer service and http API server.
 func StartObserver(listenAddr string, version string) (service *Service, httpServer *http.Server, err error) {
-	// init node
-	if err = initNode(); err != nil {
-		log.WithError(err).Fatal("init node failed")
-	}
-
 	// start service
 	if service, err = startService(); err != nil {
 		log.WithError(err).Fatal("start observation failed")
diff --git a/sqlchain/observer/service.go b/sqlchain/observer/service.go
@@ -309,6 +309,9 @@ func (s *Service) addBlock(dbID proto.DatabaseID, count int32, b *types.Block) (
 	if err != nil {
 		return
 	}
+	if b == nil {
+		return
+	}
 
 	h := int32(b.Timestamp().Sub(instance.GenesisBlock.Timestamp()) / conf.GConf.SQLChainPeriod)
 	key := utils.ConcatAll(int32ToBytes(h), b.BlockHash().AsBytes(), int32ToBytes(count))

Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,9 @@ func (s Service) addBlock(dbID proto.DatabaseID, count int32, b types.Block) (`
`309`	`309`	`if err != nil {`
`310`	`310`	`return`
`311`	`311`	`}`
	`312`	`+ if b == nil {`
	`313`	`+ return`
	`314`	`+ }`
`312`	`315`
`313`	`316`	`h := int32(b.Timestamp().Sub(instance.GenesisBlock.Timestamp()) / conf.GConf.SQLChainPeriod)`
`314`	`317`	`key := utils.ConcatAll(int32ToBytes(h), b.BlockHash().AsBytes(), int32ToBytes(count))`