Merge pull request #1300 from StefanOberhumer/MinimalChanges

jean-m-cyr · web-flow · commit 07cfba79305b · 2018-06-23T21:53:13.000-04:00
Different small changes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Basic API authentication to protect exposure of API port to the internet [#1228](https://github.com/ethereum-mining/ethminer/pull/1228).
 - Add `ispaused` information into response of `miner_getstathr` API query [#1232](https://github.com/ethereum-mining/ethminer/pull/1232).
+- API responses return "ethminer-" as version prefix. [#1300](https://github.com/ethereum-mining/ethminer/pull/1300).
 
 ## 0.15.0rc1
 
diff --git a/docs/API_DOCUMENTATION.md b/docs/API_DOCUMENTATION.md
@@ -176,7 +176,7 @@ and expect back a response like this:
   "id": 1,
   "jsonrpc": "2.0",
   "result": [
-    "0.16.0.dev0+commit.41639944",          // The actual release of ethminer
+    "ethminer-0.16.0.dev0+commit.41639944", // Running ethminer's version
     "48",                                   // Total running time in minutes
     "87221;54;0",                           // ETH hashrate in KH/s, submitted shares, rejected shares
     "14683;14508;14508;14508;14508;14508",  // Detailed ETH hashrate in KH/s per GPU
@@ -257,7 +257,7 @@ and expect back a response like this:
        true,
        false
     ],
-    "version": "0.16.0.dev0+commit.41639944" // Running ethminer's version
+    "version": "ethminer-0.16.0.dev0+commit.41639944" // Running ethminer's version
   }
 }
 ```
diff --git a/libapicore/ApiServer.cpp b/libapicore/ApiServer.cpp
@@ -625,7 +625,7 @@ Json::Value ApiConnection::getMinerStat1()
 
 	Json::Value jRes;
 
-	jRes[0] = ethminer_get_buildinfo()->project_version;  //miner version.
+	jRes[0] = std::string("ethminer-") + ethminer_get_buildinfo()->project_version;  //miner version.
 	jRes[1] = toString(runningTime.count()); // running time, in minutes.
 	jRes[2] = totalMhEth.str();              // total ETH hashrate in MH/s, number of ETH shares, number of ETH rejected shares.
 	jRes[3] = detailedMhEth.str();           // detailed ETH hashrate for all GPUs.
@@ -657,7 +657,7 @@ Json::Value ApiConnection::getMinerStatHR()
 	Json::Value ispaused;
 	ostringstream poolAddresses;
 
-	version << ethminer_get_buildinfo()->project_version;
+	version << "ethminer-" << ethminer_get_buildinfo()->project_version;
 	runtime << toString(runningTime.count());
 	poolAddresses << m_farm.get_pool_addresses(); 
 
@@ -681,8 +681,8 @@ Json::Value ApiConnection::getMinerStatHR()
 	}
 
 	Json::Value jRes;
-	jRes["version"] = version.str();		// miner version.
-	jRes["runtime"] = runtime.str();		// running time, in minutes.
+	jRes["version"] = version.str();                // miner version.
+	jRes["runtime"] = runtime.str();                // running time, in minutes.
 	// total ETH hashrate in MH/s, number of ETH shares, number of ETH rejected shares.
 	jRes["ethhashrate"] = (p.rate());
 	jRes["ethhashrates"] = detailedMhEth;
diff --git a/libapicore/httpServer.cpp b/libapicore/httpServer.cpp
@@ -18,15 +18,15 @@ httpServer http_server;
 
 void httpServer::tableHeader(stringstream& ss, unsigned columns)
 {
-    auto info = ethminer_get_buildinfo();
+    auto version = std::string("ethminer-") + ethminer_get_buildinfo()->project_version;
     char hostName[HOST_NAME_MAX + 1];
     gethostname(hostName, HOST_NAME_MAX + 1);
     string l = m_farm->farmLaunchedFormatted();
     ss <<
        "<html><head><title>" << hostName <<
        "</title><style>tr:nth-child(even){background-color:Gainsboro;}</style>"
        "<meta http-equiv=refresh content=30></head><body><table width=\"50%\" border=1 cellpadding=2 cellspacing=0 align=center>"
-       "<tr valign=top align=center style=background-color:Gold><th colspan=" << columns << ">" << info->project_version <<
+       "<tr valign=top align=center style=background-color:Gold><th colspan=" << columns << ">" << version <<
        " on " << hostName << " - " << l << "</th></tr>";
 }
 
diff --git a/libethcore/Miner.h b/libethcore/Miner.h
@@ -235,7 +235,7 @@ class Miner: public Worker
 	void update_temperature(unsigned temperature)
 	{
 		/*
-		 cnote << "Setting temp" << temperature << " for gpu/" << index <<
+		 cnote << "Setting temp" << temperature << " for gpu" << index <<
 		          " tstop=" << farm.get_tstop() << " tstart=" << farm.get_tstart();
 		*/
 		bool _wait_for_tstart_temp = m_wait_for_tstart_temp.load(std::memory_order_relaxed);
@@ -244,14 +244,14 @@ class Miner: public Worker
 			unsigned tstop = farm.get_tstop();
 			if (tstop && temperature >= tstop)
 			{
-				cwarn << "Pause mining on gpu/" << index << " : temperature " << temperature << " is above --tstop " << tstop;
+				cwarn << "Pause mining on gpu" << index << " : temperature " << temperature << " is above --tstop " << tstop;
 				m_wait_for_tstart_temp.store(true, std::memory_order_relaxed);
 			}
 		} else {
 			unsigned tstart = farm.get_tstart();
 			if (tstart && temperature <= tstart)
 			{
-				cnote << "(Re)starting mining on gpu/" << index << " : temperature " << temperature << " is now below --tstart " << tstart;
+				cnote << "(Re)starting mining on gpu" << index << " : temperature " << temperature << " is now below --tstart " << tstart;
 				m_wait_for_tstart_temp.store(false, std::memory_order_relaxed);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ class Miner: public Worker`
`235`	`235`	`void update_temperature(unsigned temperature)`
`236`	`236`	`{`
`237`	`237`	`/*`
`238`		`- cnote << "Setting temp" << temperature << " for gpu/" << index <<`
	`238`	`+ cnote << "Setting temp" << temperature << " for gpu" << index <<`
`239`	`239`	`" tstop=" << farm.get_tstop() << " tstart=" << farm.get_tstart();`
`240`	`240`	`*/`
`241`	`241`	`bool _wait_for_tstart_temp = m_wait_for_tstart_temp.load(std::memory_order_relaxed);`
`@@ -244,14 +244,14 @@ class Miner: public Worker`
`244`	`244`	`unsigned tstop = farm.get_tstop();`
`245`	`245`	`if (tstop && temperature >= tstop)`
`246`	`246`	`{`
`247`		`- cwarn << "Pause mining on gpu/" << index << " : temperature " << temperature << " is above --tstop " << tstop;`
	`247`	`+ cwarn << "Pause mining on gpu" << index << " : temperature " << temperature << " is above --tstop " << tstop;`
`248`	`248`	`m_wait_for_tstart_temp.store(true, std::memory_order_relaxed);`
`249`	`249`	`}`
`250`	`250`	`} else {`
`251`	`251`	`unsigned tstart = farm.get_tstart();`
`252`	`252`	`if (tstart && temperature <= tstart)`
`253`	`253`	`{`
`254`		`- cnote << "(Re)starting mining on gpu/" << index << " : temperature " << temperature << " is now below --tstart " << tstart;`
	`254`	`+ cnote << "(Re)starting mining on gpu" << index << " : temperature " << temperature << " is now below --tstart " << tstart;`
`255`	`255`	`m_wait_for_tstart_temp.store(false, std::memory_order_relaxed);`
`256`	`256`	`}`
`257`	`257`	`}`