piparser: Complete its decoupling in case of its failure

Complete the decoupling of piparser in case of its failure.
decred · May 28, 2019 · 2aaebc7 · 2aaebc7
1 parent cbe27a2
commit 2aaebc7
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/cmd/rebuilddb2/rebuilddb2.go b/cmd/rebuilddb2/rebuilddb2.go
@@ -132,10 +132,15 @@ func mainCore() error {
 		return err
 	}
 
+	var piParser dcrpg.ProposalsFetcher
+	if parser != nil {
+		piParser = parser
+	}
+
 	// Construct a ChainDB without a stakeDB to allow quick dropping of tables.
 	mpChecker := rpcutils.NewMempoolAddressChecker(client, activeChain)
 	db, err := dcrpg.NewChainDB(&dbi, activeChain, nil, false, cfg.HidePGConfig, 0,
-		mpChecker, parser, client)
+		mpChecker, piParser, client)
 	if db != nil {
 		defer db.Close()
 	}

diff --git a/db/dcrpg/pgblockchain.go b/db/dcrpg/pgblockchain.go
@@ -13,7 +13,6 @@ import (
 	"fmt"
 	"reflect"
 	"runtime"
-	"runtime/debug"
 	"strconv"
 	"strings"
 	"sync"
@@ -1119,15 +1118,14 @@ func (pgb *ChainDB) VotesInBlock(hash string) (int16, error) {
 func (pgb *ChainDB) proposalsUpdateHandler() {
 	// Do not initiate the async update if invalid piparser instance was found.
 	if pgb.piparser == nil {
-		log.Debug("invalid piparser instance was found: async update stopped")
+		log.Error("invalid piparser instance was found: async update stopped")
 		return
 	}
 
 	go func() {
 		defer func() {
 			if r := recover(); r != nil {
 				log.Errorf("recovered from piparser panic in proposalsUpdateHandler: %v", r)
-				log.Errorf(string(debug.Stack()))
 				select {
 				case <-time.NewTimer(time.Minute).C:
 					log.Infof("attempting to restart proposalsUpdateHandler")

diff --git a/gov/politeia/proposals.go b/gov/politeia/proposals.go
@@ -320,7 +320,7 @@ func (db *ProposalDB) CheckProposalsUpdates() error {
 	// Retrieve and update any new proposals created since the previous
 	// proposals were stored in the db.
 	lastProposal, err := db.lastSavedProposal()
-	if err != nil {
+	if err != nil && err != storm.ErrNotFound {
 		return fmt.Errorf("lastSavedProposal failed: %v", err)
 	}
 

diff --git a/main.go b/main.go
@@ -185,6 +185,11 @@ func _main(ctx context.Context) error {
 		log.Error(err)
 	}
 
+	var piParser dcrpg.ProposalsFetcher
+	if parser != nil {
+		piParser = parser
+	}
+
 	// Auxiliary DB (PostgreSQL)
 	var newPGIndexes, updateAllAddresses, updateAllVotes bool
 	pgHost, pgPort := cfg.PGHost, ""
@@ -215,7 +220,7 @@ func _main(ctx context.Context) error {
 	mpChecker := rpcutils.NewMempoolAddressChecker(dcrdClient, activeChain)
 	chainDB, err := dcrpg.NewChainDBWithCancel(ctx, &dbi, activeChain,
 		stakeDB, !cfg.NoDevPrefetch, cfg.HidePGConfig, rowCap,
-		mpChecker, parser, dcrdClient)
+		mpChecker, piParser, dcrdClient)
 	if chainDB != nil {
 		defer chainDB.Close()
 	}

diff --git a/public/js/controllers/proposal_controller.js b/public/js/controllers/proposal_controller.js
@@ -10,6 +10,7 @@ let common = {
   fillGraph: true,
   strokeWidth: 2,
   gridLineColor: '#C4CBD2',
+  labelsUTC: true,
   legendFormatter: legendFormatter
 }
 

diff --git a/views/agenda.tmpl b/views/agenda.tmpl
@@ -1,7 +1,7 @@
 {{define "agenda"}}
 <!DOCTYPE html>
 <html lang="en">
-    {{template "html-head" printf "Decred Vote Agenda Pages"}}
+    {{template "html-head" printf "Decred Agenda Charts"}}
         {{template "navbar" .}}
         {{with .Ai}}
         <div class="container main">

diff --git a/views/proposal.tmpl b/views/proposal.tmpl
@@ -1,7 +1,7 @@
 {{define "proposal"}}
 <!DOCTYPE html>
 <html lang="en">
-    {{template "html-head" printf "Decred Vote Proposal Pages"}}
+    {{template "html-head" printf "Decred Proposal Charts"}}
         {{template "navbar" .}}
         {{with .Data}}
         <div class="container">