From 558a479ff72d13ec6849da973f4491e53fbf385d Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 14 Mar 2016 14:20:00 +0100 Subject: Change json attributes --- src/main/java/org/openslx/dnbd3/status/WebServer.java | 5 +++-- src/main/java/org/openslx/dnbd3/status/output/EdgeSerializer.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/org/openslx/dnbd3/status') diff --git a/src/main/java/org/openslx/dnbd3/status/WebServer.java b/src/main/java/org/openslx/dnbd3/status/WebServer.java index c8750b8..70978c1 100644 --- a/src/main/java/org/openslx/dnbd3/status/WebServer.java +++ b/src/main/java/org/openslx/dnbd3/status/WebServer.java @@ -22,10 +22,11 @@ public class WebServer extends NanoHTTPD { super( port ); List pollers = new ArrayList<>(); + pollers.add( new ServerPoller( "132.230.4.2", 5003 ) ); pollers.add( new ServerPoller( "132.230.8.113", 5003 ) ); pollers.add( new ServerPoller( "132.230.4.60", 5003 ) ); - pollers.add( new ServerPoller( "10.4.128.38", 5003 ) ); - pollers.add( new ServerPoller( "132.230.4.2", 5003 ) ); + pollers.add( new ServerPoller( "10.16.0.1", 5003 ) ); + pollers.add( new ServerPoller( "10.16.0.2", 5003 ) ); imageGenerator = new StatisticsGenerator( pollers ); } diff --git a/src/main/java/org/openslx/dnbd3/status/output/EdgeSerializer.java b/src/main/java/org/openslx/dnbd3/status/output/EdgeSerializer.java index e014bb3..04dd45e 100644 --- a/src/main/java/org/openslx/dnbd3/status/output/EdgeSerializer.java +++ b/src/main/java/org/openslx/dnbd3/status/output/EdgeSerializer.java @@ -18,7 +18,7 @@ public class EdgeSerializer implements JsonSerializer final JsonObject out = new JsonObject(); out.addProperty( "source", src.getSource().getId() ); out.addProperty( "target", src.getTarget().getId() ); - out.addProperty( "width", src.getWeight() ); + out.addProperty( "received", src.getWeight() ); return out; } -- cgit v1.2.3-55-g7522