Remove logs

leventeliu · leventeliu · commit 6ef706d64c61 · 2018-07-12T21:52:17.000+08:00
diff --git a/sqlchain/chain.go b/sqlchain/chain.go
@@ -408,7 +408,7 @@ func (c *Chain) produceBlock(now time.Time) (err error) {
 	// Advise new block to the other peers
 	req := &MuxAdviseNewBlockReq{
 		Envelope: proto.Envelope{
-			// TODO(leventeliu): Add
+			// TODO(leventeliu): Add fields.
 		},
 		DatabaseID: c.rt.databaseID,
 		AdviseNewBlockReq: AdviseNewBlockReq{
@@ -421,7 +421,8 @@ func (c *Chain) produceBlock(now time.Time) (err error) {
 	for _, p := range c.rt.peers.Servers {
 		if p.ID != c.rt.server.ID {
 			if err = c.cl.CallNode(p.ID, method, req, resp); err != nil {
-				log.Errorf("Failed to advise now block to node %s", string(p.ID))
+				log.WithField("node", string(p.ID)).WithError(err).Errorln(
+					"Failed to advise new block")
 			}
 		}
 	}
@@ -438,7 +439,8 @@ func (c *Chain) runCurrentTurn(now time.Time) {
 	}
 
 	if err := c.produceBlock(now); err != nil {
-		log.Errorf("Failed to produce block: err = %v, now = %s", err, now.Format(time.RFC3339Nano))
+		log.WithField("now", now.Format(time.RFC3339Nano)).WithError(err).Errorln(
+			"Failed to produce block")
 	}
 }
 
@@ -493,7 +495,6 @@ func (c *Chain) Start() (err error) {
 // Stop stops the main process of the sql-chain.
 func (c *Chain) Stop() (err error) {
 	// Stop main process
-	log.Debugf("chain stopping: %p", c)
 	c.rt.stop()
 
 	// Close database file
diff --git a/sqlchain/chain_test.go b/sqlchain/chain_test.go
@@ -317,7 +317,14 @@ func TestMultiChain(t *testing.T) {
 			t.Fatalf("Error occurred: %v", err)
 		}
 
-		// Create some random clients to push new queries
+		defer func(c *Chain) {
+			// Stop chain main process
+			c.Stop()
+		}(chains[i])
+	}
+
+	// Create some random clients to push new queries
+	for i := range chains {
 		sC := make(chan struct{})
 		wg := &sync.WaitGroup{}
 		wk := &nodeProfile{
@@ -326,7 +333,7 @@ func TestMultiChain(t *testing.T) {
 			PublicKey:  testPubKey,
 		}
 
-		for x := 0; x < testClientNumberPerChain; x++ {
+		for j := 0; j < testClientNumberPerChain; j++ {
 			cli, err := newRandomNode()
 
 			if err != nil {
@@ -356,13 +363,11 @@ func TestMultiChain(t *testing.T) {
 			}(chains[i], cli)
 		}
 
-		defer func(c *Chain) {
+		defer func() {
 			// Quit client goroutines
 			close(sC)
 			wg.Wait()
-			// Stop chain main process
-			c.Stop()
-		}(chains[i])
+		}()
 	}
 
 	time.Sleep(time.Duration(testPeriodNumber) * testPeriod)
diff --git a/sqlchain/errors.go b/sqlchain/errors.go
@@ -69,5 +69,5 @@ var (
 	ErrCorruptedIndex = errors.New("corrupted index item")
 
 	// ErrUnknownMuxRequest indicates that the a multiplexing request endpoint is not found.
-	ErrUnknownMuxRequest = errors.New("known multiplexing request")
+	ErrUnknownMuxRequest = errors.New("unknown multiplexing request")
 )
diff --git a/sqlchain/xxx_test.go b/sqlchain/xxx_test.go
@@ -310,7 +310,6 @@ func registerNodesWithPublicKey(pub *asymmetric.PublicKey, diff int, num int) (
 		}()
 		n := <-nCh
 		nis[i] = n
-		log.Debugf("Get new nonce: %+v", n)
 		next = n.Nonce
 		next.Inc()
 
@@ -462,7 +461,6 @@ func createTestPeers(num int) (nis []cpuminer.NonceInfo, p *kayak.Peers, err err
 			ID:     proto.NodeID(nis[i].Hash.String()),
 			PubKey: pub,
 		}
-		log.Debugf("Created new node: %+v", s[i])
 	}
 
 	p = &kayak.Peers{

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ func (c *Chain) produceBlock(now time.Time) (err error) {`
`408`	`408`	`// Advise new block to the other peers`
`409`	`409`	`req := &MuxAdviseNewBlockReq{`
`410`	`410`	`Envelope: proto.Envelope{`
`411`		`- // TODO(leventeliu): Add`
	`411`	`+ // TODO(leventeliu): Add fields.`
`412`	`412`	`},`
`413`	`413`	`DatabaseID: c.rt.databaseID,`
`414`	`414`	`AdviseNewBlockReq: AdviseNewBlockReq{`
`@@ -421,7 +421,8 @@ func (c *Chain) produceBlock(now time.Time) (err error) {`
`421`	`421`	`for _, p := range c.rt.peers.Servers {`
`422`	`422`	`if p.ID != c.rt.server.ID {`
`423`	`423`	`if err = c.cl.CallNode(p.ID, method, req, resp); err != nil {`
`424`		`- log.Errorf("Failed to advise now block to node %s", string(p.ID))`
	`424`	`+ log.WithField("node", string(p.ID)).WithError(err).Errorln(`
	`425`	`+ "Failed to advise new block")`
`425`	`426`	`}`
`426`	`427`	`}`
`427`	`428`	`}`
`@@ -438,7 +439,8 @@ func (c *Chain) runCurrentTurn(now time.Time) {`
`438`	`439`	`}`
`439`	`440`
`440`	`441`	`if err := c.produceBlock(now); err != nil {`
`441`		`- log.Errorf("Failed to produce block: err = %v, now = %s", err, now.Format(time.RFC3339Nano))`
	`442`	`+ log.WithField("now", now.Format(time.RFC3339Nano)).WithError(err).Errorln(`
	`443`	`+ "Failed to produce block")`
`442`	`444`	`}`
`443`	`445`	`}`
`444`	`446`
`@@ -493,7 +495,6 @@ func (c *Chain) Start() (err error) {`
`493`	`495`	`// Stop stops the main process of the sql-chain.`
`494`	`496`	`func (c *Chain) Stop() (err error) {`
`495`	`497`	`// Stop main process`
`496`		`- log.Debugf("chain stopping: %p", c)`
`497`	`498`	`c.rt.stop()`
`498`	`499`
`499`	`500`	`// Close database file`
Original file line number	Diff line number	Diff line change
`@@ -69,5 +69,5 @@ var (`
`69`	`69`	`ErrCorruptedIndex = errors.New("corrupted index item")`
`70`	`70`
`71`	`71`	`// ErrUnknownMuxRequest indicates that the a multiplexing request endpoint is not found.`
`72`		`- ErrUnknownMuxRequest = errors.New("known multiplexing request")`
	`72`	`+ ErrUnknownMuxRequest = errors.New("unknown multiplexing request")`
`73`	`73`	`)`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,6 @@ func registerNodesWithPublicKey(pub *asymmetric.PublicKey, diff int, num int) (`
`310`	`310`	`}()`
`311`	`311`	`n := <-nCh`
`312`	`312`	`nis[i] = n`
`313`		`- log.Debugf("Get new nonce: %+v", n)`
`314`	`313`	`next = n.Nonce`
`315`	`314`	`next.Inc()`
`316`	`315`
`@@ -462,7 +461,6 @@ func createTestPeers(num int) (nis []cpuminer.NonceInfo, p *kayak.Peers, err err`
`462`	`461`	`ID: proto.NodeID(nis[i].Hash.String()),`
`463`	`462`	`PubKey: pub,`
`464`	`463`	`}`
`465`		`- log.Debugf("Created new node: %+v", s[i])`
`466`	`464`	`}`
`467`	`465`
`468`	`466`	`p = &kayak.Peers{`