zecfoundation
/
s-nomp
mirror of https://github.com/ZcashFoundation/s-nomp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39 from bluecircle/bluecircle 

Fix hashrate bug and add stats by algorithm to index and stats pages
This commit is contained in:
Matthew Little 2014-04-04 10:55:54 -06:00
parent 257010f6a4 4b49b70e13
commit 3509d3f19b
4 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/stats.js
View File

@ -135,8 +135,7 @@ module.exports = function(logger, portalConfig, poolConfigs){
});
var shareMultiplier = algos[coinStats.algorithm].multiplier || 0;
var hashratePre = shareMultiplier * coinStats.shares / portalConfig.website.hashrateWindow;
coinStats.hashrate = hashratePre / 1e3 | 0;
portalStats.global.hashrate += coinStats.hashrate;
coinStats.hashrate = hashratePre | 0;
portalStats.global.workers += Object.keys(coinStats.workers).length;
/* algorithm specific global stats */

12
website/index.html
View File

@ -50,10 +50,12 @@
</li>
</ul>
<div class="stats">
<div><i class="fa fa-users"></i>&nbsp;<span id="statsMiners">{{=it.stats.global.workers}}</span> Miners</div>
<div><i class="fa fa-tachometer"></i>&nbsp;<span id="statsHashrate">{{=it.stats.global.hashrate}}</span> KH/s</div>
</div>
{{ for(var algo in it.stats.algos) { }}
{{=algo}}: <div class="stats">
<div><i class="fa fa-users"></i>&nbsp;<span id="statsMiners{{=algo}}">{{=it.stats.algos[algo].workers}}</span> Miners</div>
<div><i class="fa fa-tachometer"></i>&nbsp;<span id="statsHashrate{{=algo}}">{{=it.stats.algos[algo].hashrateString}}</span></div>
</div>&nbsp;
{{ } }}
</div>
</header>
@ -86,4 +88,4 @@
</body>
</html>
</html>

30
website/pages/stats.html
View File

@ -1,5 +1,27 @@
<div>
fancy graphs here
<br>
{{=JSON.stringify(it.stats)}}
</div>
<table class="pure-table">
<thead>
<tr>
<th>Pool</th>
<th>Algo</th>
<th>Workers</th>
<th>Valid Shares</th>
<th>Invalid Shares</th>
<th>Blocks</th>
<th>Hashrate</th>
</tr>
</tr>
</thead>
{{ for(var pool in it.stats.pools) { }}
<tr class="pure-table-odd">
<td>{{=it.stats.pools[pool].name}}</td>
<td>{{=it.stats.pools[pool].algorithm}}</td>
<td>{{=Object.keys(it.stats.pools[pool].workers).length}}</td>
<td>{{=it.stats.pools[pool].poolStats.validShares}}</td>
<td>{{=it.stats.pools[pool].poolStats.invalidShares}}</td>
<td>{{=it.stats.pools[pool].poolStats.validBlocks}}</td>
<td>{{=it.stats.pools[pool].hashrateString}}</div>
</tr>
{{ } }}
</table>
</div>

9
website/static/main.js
View File

@ -1,6 +1,5 @@
$(function(){
var hotSwap = function(page, pushSate){
if (pushSate) history.pushState(null, null, '/' + page);
$('.selected').removeClass('selected');
@ -29,8 +28,10 @@ $(function(){
var statsSource = new EventSource("/api/live_stats");
statsSource.addEventListener('message', function(e){
var stats = JSON.parse(e.data);
$('#statsMiners').text(stats.global.workers);
$('#statsHashrate').text(stats.global.hashrate);
for (algo in algos) {
$('#statsMiners'+algo).text(stats.algos[algo].workers);
$('#statsHashrate'+algo).text(stats.algos[algo].hashrateString);
}
});
});
});