added cpu load information to status page

This commit is contained in:
orbiter 2013-07-17 12:38:12 +02:00
parent c6a6f159e8
commit aba7cc5de7
2 changed files with 8 additions and 7 deletions

View File

@ -32,6 +32,7 @@ import java.util.Date;
import net.yacy.cora.protocol.Domains;
import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.util.Memory;
import net.yacy.kelondro.io.ByteCount;
import net.yacy.kelondro.util.Formatter;
import net.yacy.kelondro.util.MemoryControl;
@ -317,6 +318,7 @@ public class Status
prop.put("totalMemory", Formatter.bytesToString(MemoryControl.total()));
prop.put("maxMemory", Formatter.bytesToString(MemoryControl.maxMemory()));
prop.put("processors", WorkflowProcessor.availableCPU);
prop.put("load", Memory.load());
// proxy traffic
//prop.put("trafficIn",bytesToString(httpdByteCountInputStream.getGlobalCount()));

View File

@ -3,18 +3,17 @@
<legend>System Status</legend>
<dl>
<dt>Process</dt>
<dd>#[versionpp]#
<dt>System</dt>
<dd>YaCy version #[versionpp]#
#(peerStatistics)#
Unknown
::
<div>Uptime: #[uptime]#</div>
#(/peerStatistics)#
</dd>
<dt>System Resources</dt>
<dd>Processors: #[processors]#</dd>
#(/peerStatistics)#
<div>Processors: #[processors]#</div>
<div>Load: #[load]#</div>
</dd>
<dt>Protection</dt>
<dd>#(protection)#
<strong>Password is missing.</strong>