Slightly rearrange hash rate and solutions logs for consistency.

jean-m-cyr · jean-m-cyr · commit d58ef27fea3f · 2018-09-04T23:17:04.000-04:00
diff --git a/ethminer/main.cpp b/ethminer/main.cpp
@@ -912,11 +912,17 @@ class MinerCLI
             {
                 auto mp = f.miningProgress();
                 auto solstats = f.getSolutionStats();
-                minelog << mp << ' ' << solstats << ' ' << f.farmLaunchedFormatted();
+                ostringstream ss;
+                ss << mp << ' ';
+                if (!(g_logOptions & LOG_PER_GPU))
+                    ss << solstats << ' ';
+                ss << f.farmLaunchedFormatted();
+                minelog << ss.str();
 
                 if (g_logOptions & LOG_PER_GPU)
                 {
                     ostringstream statdetails;
+                    statdetails << "Solutions " << solstats << ' ';
                     for (size_t i = 0; i < f.getMiners().size(); i++)
                     {
                         if (i) statdetails << " ";

Original file line number	Diff line number	Diff line change
`@@ -912,11 +912,17 @@ class MinerCLI`
`912`	`912`	`{`
`913`	`913`	`auto mp = f.miningProgress();`
`914`	`914`	`auto solstats = f.getSolutionStats();`
`915`		`- minelog << mp << ' ' << solstats << ' ' << f.farmLaunchedFormatted();`
	`915`	`+ ostringstream ss;`
	`916`	`+ ss << mp << ' ';`
	`917`	`+ if (!(g_logOptions & LOG_PER_GPU))`
	`918`	`+ ss << solstats << ' ';`
	`919`	`+ ss << f.farmLaunchedFormatted();`
	`920`	`+ minelog << ss.str();`
`916`	`921`
`917`	`922`	`if (g_logOptions & LOG_PER_GPU)`
`918`	`923`	`{`
`919`	`924`	`ostringstream statdetails;`
	`925`	`+ statdetails << "Solutions " << solstats << ' ';`
`920`	`926`	`for (size_t i = 0; i < f.getMiners().size(); i++)`
`921`	`927`	`{`
`922`	`928`	`if (i) statdetails << " ";`