diff options
| author | Simon Rettberg | 2023-09-27 18:31:32 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2023-09-27 18:31:32 +0200 |
| commit | 7de5c49c0da40932d30eff97601911b04895dfee (patch) | |
| tree | a356138580b5f00494c5a0699891b1b71cda7cec /src/main/java/org/openslx/dnbd3 | |
| parent | Work around race condition instead of proper rearchitecturing (diff) | |
| download | dnbd3-status-7de5c49c0da40932d30eff97601911b04895dfee.tar.gz dnbd3-status-7de5c49c0da40932d30eff97601911b04895dfee.tar.xz dnbd3-status-7de5c49c0da40932d30eff97601911b04895dfee.zip | |
Remove legacy PNG output mode
Diffstat (limited to 'src/main/java/org/openslx/dnbd3')
3 files changed, 2 insertions, 31 deletions
diff --git a/src/main/java/org/openslx/dnbd3/status/StatisticsGenerator.java b/src/main/java/org/openslx/dnbd3/status/StatisticsGenerator.java index 48b075d..3b70ab7 100644 --- a/src/main/java/org/openslx/dnbd3/status/StatisticsGenerator.java +++ b/src/main/java/org/openslx/dnbd3/status/StatisticsGenerator.java @@ -145,17 +145,6 @@ public class StatisticsGenerator } } - public byte[] getImagePng() - { - ensureUpToDate(); - synchronized ( graph ) { - if ( imgData == null ) { - imgData = graph.makeNextImage(); - } - } - return imgData; - } - public String getJson( boolean newFormat ) { ensureUpToDate(); diff --git a/src/main/java/org/openslx/dnbd3/status/WebServer.java b/src/main/java/org/openslx/dnbd3/status/WebServer.java index f652f6a..d67c22a 100644 --- a/src/main/java/org/openslx/dnbd3/status/WebServer.java +++ b/src/main/java/org/openslx/dnbd3/status/WebServer.java @@ -1,6 +1,5 @@ package org.openslx.dnbd3.status; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; @@ -45,8 +44,6 @@ public class WebServer extends NanoHTTPD String uri = session.getUri(); // Special/dynamic - if ( uri.equals( "/image.png" ) ) - return serveImage(); if ( uri.equals( "/data.json" ) ) return serveJson(false); if ( uri.equals( "/data2.json" ) ) @@ -87,19 +84,6 @@ public class WebServer extends NanoHTTPD return new NanoHTTPD.Response( NanoHTTPD.Response.Status.NOT_FOUND, "text/plain", "Nicht gefunden!" ); } - private NanoHTTPD.Response serveImage() - { - InputStream is = null; - byte[] imgData = imageGenerator.getImagePng(); - if ( imgData != null ) - is = new ByteArrayInputStream( imgData ); - if ( is == null ) { - return new NanoHTTPD.Response( NanoHTTPD.Response.Status.INTERNAL_ERROR, "text/plain", "Internal Server Error" ); - } else { - return new NanoHTTPD.Response( NanoHTTPD.Response.Status.OK, "image/png", is ); - } - } - private NanoHTTPD.Response serveJson(boolean newFormat) { String data = imageGenerator.getJson(newFormat); diff --git a/src/main/java/org/openslx/dnbd3/status/poller/ServerPoller.java b/src/main/java/org/openslx/dnbd3/status/poller/ServerPoller.java index 492e371..a806912 100644 --- a/src/main/java/org/openslx/dnbd3/status/poller/ServerPoller.java +++ b/src/main/java/org/openslx/dnbd3/status/poller/ServerPoller.java @@ -47,11 +47,11 @@ public class ServerPoller is = con.getInputStream(); } catch ( java.net.SocketTimeoutException e ) { - System.out.println( "Timeout " + this.server ); + //System.out.println( "Timeout " + this.server ); NanoHTTPD.safeClose( is ); return null; } catch ( java.io.IOException e ) { - System.out.println( "IOException " + this.server ); + //System.out.println( "IOException " + this.server ); NanoHTTPD.safeClose( is ); return null; } @@ -79,8 +79,6 @@ public class ServerPoller e.printStackTrace(); status = null; } - // TODO: http://docs.oracle.com/javase/6/docs/technotes/guides/net/http-keepalive.html - // once dnbd3 server supports keep-alive connections return status; } |