diff options
5 files changed, 39 insertions, 8 deletions
diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java index 5bdb9bb..5132bbf 100644 --- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -710,7 +710,7 @@ public abstract class NanoHTTPD { try { this.data = txt != null ? new ByteArrayInputStream(txt.getBytes("UTF-8")) : null; } catch (java.io.UnsupportedEncodingException uee) { - uee.printStackTrace(); + LOG.log(Level.SEVERE,"encoding problem",uee); } } diff --git a/markdown-plugin/src/main/java/fi/iki/elonen/MarkdownWebServerPlugin.java b/markdown-plugin/src/main/java/fi/iki/elonen/MarkdownWebServerPlugin.java index a400cb4..6c1fc14 100644 --- a/markdown-plugin/src/main/java/fi/iki/elonen/MarkdownWebServerPlugin.java +++ b/markdown-plugin/src/main/java/fi/iki/elonen/MarkdownWebServerPlugin.java @@ -41,6 +41,8 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; import org.pegdown.PegDownProcessor; @@ -49,7 +51,12 @@ import org.pegdown.PegDownProcessor; * On: 9/13/13 at 4:03 AM */ public class MarkdownWebServerPlugin implements WebServerPlugin { - + + /** + * logger to log to. + */ + private static Logger LOG = Logger.getLogger(MarkdownWebServerPlugin.class.getName()); + private final PegDownProcessor processor; public MarkdownWebServerPlugin() { @@ -88,7 +95,7 @@ public class MarkdownWebServerPlugin implements WebServerPlugin { reader.close(); return sb.toString(); } catch (Exception e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, "could not read source",e); return null; } finally { try { @@ -98,7 +105,9 @@ public class MarkdownWebServerPlugin implements WebServerPlugin { if (reader != null) { reader.close(); } - } catch (IOException ignored) {} + } catch (IOException ignored) { + LOG.log(Level.FINEST, "close failed",ignored); + } } } } diff --git a/webserver/src/main/java/fi/iki/elonen/ServerRunner.java b/webserver/src/main/java/fi/iki/elonen/ServerRunner.java index d3615a7..cfb1d6f 100644 --- a/webserver/src/main/java/fi/iki/elonen/ServerRunner.java +++ b/webserver/src/main/java/fi/iki/elonen/ServerRunner.java @@ -34,13 +34,20 @@ package fi.iki.elonen; */ import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; public class ServerRunner { + /** + * logger to log to. + */ + private static Logger LOG = Logger.getLogger(ServerRunner.class.getName()); + public static <T extends NanoHTTPD> void run(Class<T> serverClass) { try { executeInstance((NanoHTTPD) serverClass.newInstance()); } catch (Exception e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, "Cound nor create server",e); } } diff --git a/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java b/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java index 3f1e1f4..9c3b8c7 100644 --- a/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java +++ b/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java @@ -45,12 +45,19 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; import fi.iki.elonen.NanoWebSocketServer.WebSocketFrame.CloseCode; import fi.iki.elonen.NanoWebSocketServer.WebSocketFrame.CloseFrame; import fi.iki.elonen.NanoWebSocketServer.WebSocketFrame.OpCode; public abstract class NanoWebSocketServer extends NanoHTTPD { + /** + * logger to log to. + */ + private static Logger LOG = Logger.getLogger(NanoWebSocketServer.class.getName()); + public static final String HEADER_UPGRADE = "upgrade"; public static final String HEADER_UPGRADE_VALUE = "websocket"; public static final String HEADER_CONNECTION = "connection"; @@ -307,14 +314,14 @@ public abstract class NanoWebSocketServer extends NanoHTTPD { try { in.close(); } catch (IOException e) { - e.printStackTrace(); + LOG.log(Level.FINE, "close failed",e); } } if (out != null) { try { out.close(); } catch (IOException e) { - e.printStackTrace(); + LOG.log(Level.FINE, "close failed",e); } } state = State.CLOSED; diff --git a/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java b/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java index 8d5b752..8aad58e 100644 --- a/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java +++ b/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java @@ -34,6 +34,9 @@ package fi.iki.elonen.samples.echo; */ import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; + import fi.iki.elonen.NanoWebSocketServer; /** @@ -41,6 +44,11 @@ import fi.iki.elonen.NanoWebSocketServer; * On: 4/23/14 at 10:31 PM */ public class DebugWebSocketServer extends NanoWebSocketServer { + /** + * logger to log to. + */ + private static Logger LOG = Logger.getLogger(DebugWebSocketServer.class.getName()); + private final boolean debug; public DebugWebSocketServer(int port, boolean debug) { @@ -76,7 +84,7 @@ public class DebugWebSocketServer extends NanoWebSocketServer { @Override protected void onException(WebSocket socket, IOException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE,"exception occured",e); } @Override |