Merge PR: fix without gracefully exit (#1197)

okx · Nov 16, 2021 · 677cd00 · 677cd00
1 parent 83a4a00
commit 677cd00
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/cmd/exchaind/main.go b/cmd/exchaind/main.go
@@ -109,6 +109,7 @@ func closeApp(iApp abci.Application) {
 	app := iApp.(*app.OKExChainApp)
 	app.StopStore()
 	evmtypes.CloseIndexer()
+	evmtypes.CloseTracer()
 	rpc.CloseEthBackend()
 }
 

diff --git a/x/evm/types/tracer.go b/x/evm/types/tracer.go
@@ -11,7 +11,6 @@ import (
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/eth/tracers"
 	json "github.com/json-iterator/go"
-	"github.com/okex/exchain/libs/cosmos-sdk/server"
 	sdk "github.com/okex/exchain/libs/cosmos-sdk/types"
 	tmtypes "github.com/okex/exchain/libs/tendermint/types"
 	"github.com/spf13/viper"
@@ -45,12 +44,10 @@ var (
 	evmLogConfig *vm.LogConfig
 )
 
-func init() {
-	server.TrapSignal(func() {
-		if tracesDB != nil {
-			tracesDB.Close()
-		}
-	})
+func CloseTracer() {
+	if tracesDB != nil {
+		tracesDB.Close()
+	}
 }
 
 func InitTxTraces() {