btcd: Fix nonzero exit code on sigint when indexing cfindex

Author: allocz

blockchain/indexers/common.go

@@ -21,9 +21,9 @@ var (
 	// fields for storage in the database.
 	byteOrder = binary.LittleEndian
 
-	// errInterruptRequested indicates that an operation was cancelled due
+	// ErrInterruptRequested indicates that an operation was cancelled due
 	// to a user-requested interrupt.
-	errInterruptRequested = errors.New("interrupt requested")
+	ErrInterruptRequested = errors.New("interrupt requested")
 )
 
 // NeedsInputser provides a generic interface for an indexer to specify the it

blockchain/indexers/manager.go

@@ -176,7 +176,7 @@ func (m *Manager) maybeFinishDrops(interrupt <-chan struct{}) error {
 	}
 
 	if interruptRequested(interrupt) {
-		return errInterruptRequested
+		return ErrInterruptRequested
 	}
 
 	// Finish dropping any of the enabled indexes that are already in the
@@ -240,7 +240,7 @@ func (m *Manager) Init(chain *blockchain.BlockChain, interrupt <-chan struct{})
 	}
 
 	if interruptRequested(interrupt) {
-		return errInterruptRequested
+		return ErrInterruptRequested
 	}
 
 	// Finish and drops that were previously interrupted.
@@ -350,7 +350,7 @@ func (m *Manager) Init(chain *blockchain.BlockChain, interrupt <-chan struct{})
 			}
 
 			if interruptRequested(interrupt) {
-				return errInterruptRequested
+				return ErrInterruptRequested
 			}
 		}
 
@@ -411,7 +411,7 @@ func (m *Manager) Init(chain *blockchain.BlockChain, interrupt <-chan struct{})
 		}
 
 		if interruptRequested(interrupt) {
-			return errInterruptRequested
+			return ErrInterruptRequested
 		}
 
 		// Connect the block for all indexes that need it.
@@ -448,7 +448,7 @@ func (m *Manager) Init(chain *blockchain.BlockChain, interrupt <-chan struct{})
 		progressLogger.LogBlockHeight(block)
 
 		if interruptRequested(interrupt) {
-			return errInterruptRequested
+			return ErrInterruptRequested
 		}
 	}
 
@@ -657,7 +657,7 @@ func dropIndex(db database.DB, idxKey []byte, idxName string, interrupt <-chan s
 		}
 
 		if interruptRequested(interrupt) {
-			return errInterruptRequested
+			return ErrInterruptRequested
 		}
 
 		// Drop the bucket itself.

btcd.go

@@ -265,6 +265,11 @@ func btcdMain(serverChan chan<- *server) error {
 	// Create server and start it.
 	server, err := newServer(cfg.Listeners, cfg.AgentBlacklist,
 		cfg.AgentWhitelist, db, activeNetParams.Params, interrupt)
+	if err == indexers.ErrInterruptRequested {
+		btcdLog.Infof("Unable to start server on %v: %v",
+			cfg.Listeners, err)
+		return nil
+	}
 	if err != nil {
 		// TODO: this logging could do with some beautifying.
 		btcdLog.Errorf("Unable to start server on %v: %v",