Adds a -debugminer flag

vertcoin-project · Jul 10, 2019 · e5f2ebe · e5f2ebe
1 parent d2a2e8c
commit e5f2ebe
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/main.go b/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"flag"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -14,6 +15,8 @@ import (
 )
 
 func main() {
+	debugMiner := flag.Bool("debugminers", false, "Print the output of the miner binaries to the debug log")
+	flag.Parse()
 	js := mewn.String("./frontend/dist/app.js")
 	css := mewn.String("./frontend/dist/app.css")
 
@@ -45,6 +48,7 @@ func main() {
 	})
 
 	core := mining.NewMinerCore()
+	core.DebugMiners = *debugMiner
 	app.Bind(core)
 	app.Run()
 	core.StopMining()

diff --git a/miners/ccminer.go b/miners/ccminer.go
@@ -24,8 +24,10 @@ func (l *CCMinerImpl) Configure(args BinaryArguments) error {
 }
 
 func (l *CCMinerImpl) ParseOutput(line string) {
+	if l.binaryRunner.Debug {
+		logging.Debugf("[ccminer] %s\n", line)
+	}
 	line = strings.TrimSpace(line)
-	//logging.Debugf("[ccminer] %s\n", line)
 
 	if strings.Contains(line, "GPU #") && strings.HasSuffix(line, "MH/s") {
 		startDeviceIdx := strings.Index(line, "GPU #")
@@ -58,5 +60,5 @@ func (l *CCMinerImpl) HashRate() uint64 {
 }
 
 func (l *CCMinerImpl) ConstructCommandlineArgs(args BinaryArguments) []string {
-	return []string{"--max-log-rate","0", "--no-color", "-a", "lyra2v3", "-o", args.StratumUrl, "-u", args.StratumUsername, "-p", args.StratumPassword}
+	return []string{"--max-log-rate", "0", "--no-color", "-a", "lyra2v3", "-o", args.StratumUrl, "-u", args.StratumUsername, "-p", args.StratumPassword}
 }
diff --git a/miners/lyclminer.go b/miners/lyclminer.go
@@ -68,7 +68,9 @@ func (l *LyclMinerImpl) Configure(args BinaryArguments) error {
 }
 
 func (l *LyclMinerImpl) ParseOutput(line string) {
-	//logging.Debugf("[lyclMiner] %s\n", line)
+	if l.binaryRunner.Debug {
+		logging.Debugf("[lyclMiner] %s\n", line)
+	}
 	line = strings.TrimSpace(line)
 	if strings.Contains(line, "Device #") && strings.HasSuffix(line, "MH/s") {
 		startDeviceIdx := strings.Index(line, "Device #")

diff --git a/miners/miners.go b/miners/miners.go
@@ -71,6 +71,7 @@ type BinaryRunner struct {
 	MinerBinary MinerBinary
 	MinerImpl   MinerImpl
 	cmd         *exec.Cmd
+	Debug       bool
 }
 
 func (b *BinaryRunner) logPrefix() string {

diff --git a/mining/mining.go b/mining/mining.go
@@ -28,6 +28,7 @@ type MinerCore struct {
 	stopHash            chan bool
 	stopBalance         chan bool
 	stopRunningState    chan bool
+	DebugMiners         bool
 }
 
 func NewMinerCore() *MinerCore {
@@ -159,6 +160,7 @@ func (m *MinerCore) CreateMinerBinaries() ([]*miners.BinaryRunner, error) {
 		if match {
 			logging.Debugf("Found compatible binary [%s] for [%s/%d]\n", b.MainExecutableName, b.Platform, b.GPUType)
 			br, err := miners.NewBinaryRunner(b)
+			br.Debug = m.DebugMiners
 			if err != nil {
 				return nil, err
 			}