cryptonote-social/csminer
1
1
Fork 0
mirror of https://github.com/cryptonote-social/csminer.git synced 2024-09-11 05:35:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

more logging cleanup

Browse Source
This commit is contained in:
cryptonote-social 2020-08-20 12:09:43 -07:00
parent fb26927e76
commit 37d526e481
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
miner.go
View File

@ -136,10 +136,8 @@ func Mine(c *MinerConfig) error {
if len(b) == 0 {
if !manualMinerActivate {
manualMinerActivate = true
crylog.Info("Overriding mining state to ACTIVE")
minerlib.OverrideMiningActivityState(true)
} else {
crylog.Info("Removing mining override")
manualMinerActivate = false
minerlib.RemoveMiningActivityOverride()
}
@ -213,6 +211,15 @@ func prettyInt(i int64) string {
}
func printStatsPeriodically() {
// Wait for pool stats before the first printout
for {
time.Sleep(time.Second)
s := minerlib.GetMiningState()
if s.SecondsOld >= 0 {
break
}
}
printStats(false)
for {
<-time.After(30 * time.Second)
printStats(true) // print full stats only if actively mining

12
minerlib/minerlib.go
View File

@ -329,7 +329,6 @@ func reconnectClient() <-chan *client.MultiClientJob {
// Called by PoolLogin after succesful login.
func MiningLoop(jobChan <-chan *client.MultiClientJob, done chan<- bool) {
defer func() { done <- true }()
crylog.Info("Mining loop started")
// Set up fresh stats ....
stopWorkers()
@ -371,11 +370,11 @@ func MiningLoop(jobChan <-chan *client.MultiClientJob, done chan<- bool) {
continue
}
infoStr := fmt.Sprint("Current job: ", job.JobID, " Difficulty: ", blockchain.TargetToDifficulty(job.Target))
infoStr := fmt.Sprint("Current job: ", job.JobID, " Difficulty: ", blockchain.TargetToDifficulty(job.Target))
if getMiningActivityState() < 0 {
crylog.Info(infoStr, "Mining: PAUSED")
crylog.Info(infoStr, " Mining: PAUSED")
} else {
crylog.Info(infoStr, "Mining: ACTIVE")
crylog.Info(infoStr, " Mining: ACTIVE")
}
case <-time.After(30 * time.Second):
@ -415,8 +414,6 @@ func MiningLoop(jobChan <-chan *client.MultiClientJob, done chan<- bool) {
go goMine(*job, i /*thread*/)
}
}
crylog.Info("Mining loop terminated")
}
// Stop all active worker threads and wait for them to finish before returning. Should
@ -651,6 +648,7 @@ func goMine(job client.MultiClientJob, thread int) {
if swr.PoolMargin > 0.0 {
stats.RefreshPoolStats2(swr)
} else {
crylog.Warn("Didn't get pool stats in response:", resp.Result)
updatePoolStats(true)
}
}
@ -670,7 +668,7 @@ func OverrideMiningActivityState(mine bool) {
if miningOverride == newState {
return
}
crylog.Info("New mining override state:", newState)
crylog.Info("Overriding mining state")
miningOverride = newState
if plArgs != nil {
go pokeJobDispatcher(STATE_CHANGE_POKE) // call in own goroutine in case it blocks