diff options
| author | Simon Rettberg | 2016-03-09 12:02:41 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-03-09 12:02:41 +0100 |
| commit | fd113d8e636d8dbd34885204a8a6015a76c06c82 (patch) | |
| tree | 0984564613c643062bdb1e77bc791f16bf960171 /src/main | |
| parent | Set min and max Value for the traffic graph. Increased size of labels. (diff) | |
| download | dnbd3-status-fd113d8e636d8dbd34885204a8a6015a76c06c82.tar.gz dnbd3-status-fd113d8e636d8dbd34885204a8a6015a76c06c82.tar.xz dnbd3-status-fd113d8e636d8dbd34885204a8a6015a76c06c82.zip | |
Gefrickel
Diffstat (limited to 'src/main')
3 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/dnbd3/status/StatisticsGenerator.java b/src/main/java/org/openslx/dnbd3/status/StatisticsGenerator.java index 777ce7a..1f3c25a 100644 --- a/src/main/java/org/openslx/dnbd3/status/StatisticsGenerator.java +++ b/src/main/java/org/openslx/dnbd3/status/StatisticsGenerator.java @@ -84,11 +84,9 @@ public class StatisticsGenerator srv.address = status.getAddress(); srv.bytesReceived = status.getBytesReceived(); srv.bytesSent = status.getBytesSent(); - for ( Client c : status.getClients() ) { - srv.bytesSent += c.getBytesSent(); - } srv.clientCount = status.getClients().size(); srv.uptime = status.getUptime(); + srv.timestamp = status.getTimestamp(); output.servers.add( srv ); } output.timestamp = System.currentTimeMillis(); diff --git a/src/main/java/org/openslx/dnbd3/status/WebServer.java b/src/main/java/org/openslx/dnbd3/status/WebServer.java index 14d9a09..c8750b8 100644 --- a/src/main/java/org/openslx/dnbd3/status/WebServer.java +++ b/src/main/java/org/openslx/dnbd3/status/WebServer.java @@ -24,7 +24,8 @@ public class WebServer extends NanoHTTPD List<ServerPoller> pollers = new ArrayList<>(); pollers.add( new ServerPoller( "132.230.8.113", 5003 ) ); pollers.add( new ServerPoller( "132.230.4.60", 5003 ) ); - pollers.add( new ServerPoller( "132.230.4.1", 5003 ) ); + pollers.add( new ServerPoller( "10.4.128.38", 5003 ) ); + pollers.add( new ServerPoller( "132.230.4.2", 5003 ) ); imageGenerator = new StatisticsGenerator( pollers ); } diff --git a/src/main/java/org/openslx/dnbd3/status/output/ServerStats.java b/src/main/java/org/openslx/dnbd3/status/output/ServerStats.java index c58abb3..b915484 100644 --- a/src/main/java/org/openslx/dnbd3/status/output/ServerStats.java +++ b/src/main/java/org/openslx/dnbd3/status/output/ServerStats.java @@ -15,5 +15,7 @@ public class ServerStats public long bytesSent; @Expose public long bytesReceived; + @Expose + public long timestamp; } |