From b9e8a3e02493d5bbf23cfcab259e66f6ae166612 Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Mon, 23 Jun 2014 12:54:10 +0100
Subject: modified logging API - package vars for tagged loggers - weed out
spurious fmt.PrintX and log.PrintX logging - tried to second guess loglevel
for some :)
---
ethminer/miner.go | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
(limited to 'ethminer')
diff --git a/ethminer/miner.go b/ethminer/miner.go
index 4343b4333..5f5c40134 100644
--- a/ethminer/miner.go
+++ b/ethminer/miner.go
@@ -5,9 +5,12 @@ import (
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
+ "github.com/ethereum/eth-go/ethlog"
"sort"
)
+var logger = ethlog.NewLogger("MINER")
+
type Miner struct {
pow ethchain.PoW
ethereum ethchain.EthManager
@@ -67,10 +70,10 @@ out:
break out
case chanMessage := <-miner.reactChan:
if block, ok := chanMessage.Resource.(*ethchain.Block); ok {
- //ethutil.Config.Log.Infoln("[MINER] Got new block via Reactor")
+ //logger.Infoln("Got new block via Reactor")
if bytes.Compare(miner.ethereum.BlockChain().CurrentBlock.Hash(), block.Hash()) == 0 {
// TODO: Perhaps continue mining to get some uncle rewards
- //ethutil.Config.Log.Infoln("[MINER] New top block found resetting state")
+ //logger.Infoln("New top block found resetting state")
// Filter out which Transactions we have that were not in this block
var newtxs []*ethchain.Transaction
@@ -92,7 +95,7 @@ out:
} else {
if bytes.Compare(block.PrevHash, miner.ethereum.BlockChain().CurrentBlock.PrevHash) == 0 {
- ethutil.Config.Log.Infoln("[MINER] Adding uncle block")
+ logger.Infoln("Adding uncle block")
miner.uncles = append(miner.uncles, block)
}
}
@@ -137,14 +140,14 @@ func (self *Miner) mineNewBlock() {
// Sort the transactions by nonce in case of odd network propagation
sort.Sort(ethchain.TxByNonce{self.txs})
- // Accumulate all valid transaction and apply them to the new state
+ // Accumulate all valid transactions and apply them to the new state
// Error may be ignored. It's not important during mining
parent := self.ethereum.BlockChain().GetBlock(self.block.PrevHash)
coinbase := self.block.State().GetOrNewStateObject(self.block.Coinbase)
coinbase.SetGasPool(self.block.CalcGasLimit(parent))
receipts, txs, unhandledTxs, err := stateManager.ProcessTransactions(coinbase, self.block.State(), self.block, self.block, self.txs)
if err != nil {
- ethutil.Config.Log.Debugln("[MINER]", err)
+ logger.Debugln(err)
}
self.txs = append(txs, unhandledTxs...)
@@ -156,18 +159,18 @@ func (self *Miner) mineNewBlock() {
self.block.State().Update()
- ethutil.Config.Log.Infoln("[MINER] Mining on block. Includes", len(self.txs), "transactions")
+ logger.Infoln("Mining on block. Includes", len(self.txs), "transactions")
// Find a valid nonce
self.block.Nonce = self.pow.Search(self.block, self.powQuitChan)
if self.block.Nonce != nil {
err := self.ethereum.StateManager().Process(self.block, false)
if err != nil {
- ethutil.Config.Log.Infoln(err)
+ logger.Infoln(err)
} else {
self.ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{self.block.Value().Val})
- ethutil.Config.Log.Infof("[MINER] 🔨 Mined block %x\n", self.block.Hash())
- ethutil.Config.Log.Infoln(self.block)
+ logger.Infof("🔨 Mined block %x\n", self.block.Hash())
+ logger.Infoln(self.block)
// Gather the new batch of transactions currently in the tx pool
self.txs = self.ethereum.TxPool().CurrentTransactions()
}
--
cgit v1.2.3
From 782f780476afb3c895c30583fc5cbd6d7d830d3d Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Wed, 25 Jun 2014 18:43:35 +0100
Subject: space in miner logging message
---
ethminer/miner.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'ethminer')
diff --git a/ethminer/miner.go b/ethminer/miner.go
index 5f5c40134..2c1645672 100644
--- a/ethminer/miner.go
+++ b/ethminer/miner.go
@@ -159,7 +159,7 @@ func (self *Miner) mineNewBlock() {
self.block.State().Update()
- logger.Infoln("Mining on block. Includes", len(self.txs), "transactions")
+ logger.Infof("Mining on block. Includes %v transactions", len(self.txs))
// Find a valid nonce
self.block.Nonce = self.pow.Search(self.block, self.powQuitChan)
--
cgit v1.2.3
From 853053a3b204ddf4ae935e70e0aa5b5d8994493e Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Thu, 26 Jun 2014 18:45:57 +0100
Subject: go fmt
---
ethminer/miner.go | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
(limited to 'ethminer')
diff --git a/ethminer/miner.go b/ethminer/miner.go
index 2c1645672..66388723e 100644
--- a/ethminer/miner.go
+++ b/ethminer/miner.go
@@ -3,9 +3,9 @@ package ethminer
import (
"bytes"
"github.com/ethereum/eth-go/ethchain"
+ "github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
- "github.com/ethereum/eth-go/ethlog"
"sort"
)
@@ -57,18 +57,23 @@ func NewDefaultMiner(coinbase []byte, ethereum ethchain.EthManager) Miner {
return miner
}
+
func (miner *Miner) Start() {
// Prepare inital block
//miner.ethereum.StateManager().Prepare(miner.block.State(), miner.block.State())
go miner.listener()
+ logger.Infoln("Started")
}
+
func (miner *Miner) listener() {
out:
for {
select {
case <-miner.quitChan:
+ logger.Infoln("Stopped")
break out
case chanMessage := <-miner.reactChan:
+
if block, ok := chanMessage.Resource.(*ethchain.Block); ok {
//logger.Infoln("Got new block via Reactor")
if bytes.Compare(miner.ethereum.BlockChain().CurrentBlock.Hash(), block.Hash()) == 0 {
@@ -123,8 +128,9 @@ out:
}
func (self *Miner) Stop() {
- self.powQuitChan <- ethutil.React{}
+ logger.Infoln("Stopping...")
self.quitChan <- true
+ self.powQuitChan <- ethutil.React{}
}
func (self *Miner) mineNewBlock() {
--
cgit v1.2.3