diff options
author | Wei-Ning Huang <w@dexon.org> | 2019-03-17 20:14:41 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@byzantine-lab.io> | 2019-06-12 17:27:23 +0800 |
commit | 6d4dd6853393014e6a355995dd91ecefd7a3095d (patch) | |
tree | 264e0fc935a19081af6cb72019040fc0855d39bb /dex | |
parent | 19c6af0154aa305288ab1ca2c3e716176dbd9563 (diff) | |
download | go-tangerine-6d4dd6853393014e6a355995dd91ecefd7a3095d.tar go-tangerine-6d4dd6853393014e6a355995dd91ecefd7a3095d.tar.gz go-tangerine-6d4dd6853393014e6a355995dd91ecefd7a3095d.tar.bz2 go-tangerine-6d4dd6853393014e6a355995dd91ecefd7a3095d.tar.lz go-tangerine-6d4dd6853393014e6a355995dd91ecefd7a3095d.tar.xz go-tangerine-6d4dd6853393014e6a355995dd91ecefd7a3095d.tar.zst go-tangerine-6d4dd6853393014e6a355995dd91ecefd7a3095d.zip |
dex: properly shutdown protocol stack (#267)
Diffstat (limited to 'dex')
-rw-r--r-- | dex/backend.go | 11 | ||||
-rw-r--r-- | dex/blockproposer.go | 3 | ||||
-rw-r--r-- | dex/handler.go | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/dex/backend.go b/dex/backend.go index e90c3ad10..f1b0012a2 100644 --- a/dex/backend.go +++ b/dex/backend.go @@ -259,14 +259,19 @@ func (s *Dexon) Start(srvr *p2p.Server) error { } func (s *Dexon) Stop() error { + s.bloomIndexer.Close() + s.blockchain.Stop() + s.engine.Close() + s.protocolManager.Stop() + s.txPool.Stop() + s.eventMux.Stop() s.bp.Stop() s.app.Stop() if s.indexer != nil { s.indexer.Stop() } - if s.config.BlockProposerEnabled { - s.bp.Stop() - } + s.chainDb.Close() + close(s.shutdownChan) return nil } diff --git a/dex/blockproposer.go b/dex/blockproposer.go index 6c1de818a..58e6eafee 100644 --- a/dex/blockproposer.go +++ b/dex/blockproposer.go @@ -79,10 +79,10 @@ func (b *blockProposer) run(c *dexCore.Consensus) { atomic.StoreInt32(&b.proposing, 1) <-b.stopCh log.Debug("Block proposer receive stop signal") - c.Stop() } func (b *blockProposer) Stop() { + log.Info("Stopping block proposer") b.mu.Lock() defer b.mu.Unlock() @@ -92,6 +92,7 @@ func (b *blockProposer) Stop() { b.wg.Wait() atomic.StoreInt32(&b.proposing, 0) } + log.Info("Block proposer stopped") } func (b *blockProposer) IsCoreSyncing() bool { diff --git a/dex/handler.go b/dex/handler.go index 91d7360b2..e887d54d9 100644 --- a/dex/handler.go +++ b/dex/handler.go @@ -305,7 +305,7 @@ func (pm *ProtocolManager) Start(srvr p2pServer, maxPeers int) { } func (pm *ProtocolManager) Stop() { - log.Info("Stopping Ethereum protocol") + log.Info("Stopping DEXON protocol") pm.txsSub.Unsubscribe() // quits txBroadcastLoop pm.chainHeadSub.Unsubscribe() @@ -330,7 +330,7 @@ func (pm *ProtocolManager) Stop() { // Wait for all peer handler goroutines and the loops to come down. pm.wg.Wait() - log.Info("Ethereum protocol stopped") + log.Info("DEXON protocol stopped") } func (pm *ProtocolManager) ReceiveChan() <-chan interface{} { |