Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up logging.

Browse source
This commit is contained in:
FrozenCow 2011-05-18 14:17:58 +02:00
parent e28ee185b6
commit 7937a64f06
17 changed files with 54 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/org/dynmap/web/HttpServer.java
View file

@ -7,9 +7,10 @@ import java.net.Socket;
import java.util.Collections;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.dynmap.Log;
public class HttpServer extends Thread {
protected static final Logger log = Logger.getLogger("Minecraft");
protected static final String LOG_PREFIX = "[dynmap] ";
@ -31,7 +32,7 @@ public class HttpServer extends Thread {
sock = new ServerSocket(port, 5, bindAddress);
listeningThread = this;
start();
log.info(LOG_PREFIX + "Dynmap WebServer started on " + bindAddress + ":" + port);
Log.info("Dynmap WebServer started on " + bindAddress + ":" + port);
}
public void run() {
@ -42,24 +43,24 @@ public class HttpServer extends Thread {
HttpServerConnection requestThread = new HttpServerConnection(socket, this);
requestThread.start();
} catch (IOException e) {
log.info(LOG_PREFIX + "map WebServer.run() stops with IOException");
Log.info("map WebServer.run() stops with IOException");
break;
}
}
log.info(LOG_PREFIX + "Webserver shut down.");
Log.info("Webserver shut down.");
} catch (Exception ex) {
log.log(Level.SEVERE, LOG_PREFIX + "Exception on WebServer-thread", ex);
Log.severe("Exception on WebServer-thread", ex);
}
}
public void shutdown() {
log.info(LOG_PREFIX + "Shutting down webserver...");
Log.info("Shutting down webserver...");
try {
if (sock != null) {
sock.close();
}
} catch (IOException e) {
log.log(Level.INFO, LOG_PREFIX + "Exception while closing socket for webserver shutdown", e);
Log.warning("Exception while closing socket for webserver shutdown", e);
}
listeningThread = null;
}

6
src/main/java/org/dynmap/web/HttpServerConnection.java
View file

@ -9,11 +9,11 @@ import java.io.StringWriter;
import java.net.Socket;
import java.net.URLDecoder;
import java.util.Map.Entry;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.dynmap.Log;
import org.dynmap.debug.Debug;
public class HttpServerConnection extends Thread {
@ -175,7 +175,7 @@ public class HttpServerConnection extends Thread {
} catch (IOException e) {
throw e;
} catch (Exception e) {
log.log(Level.SEVERE, LOG_PREFIX + "HttpHandler '" + handler + "' has thown an exception", e);
Log.severe("HttpHandler '" + handler + "' has thown an exception", e);
if (socket != null) {
out.flush();
socket.close();
@ -229,7 +229,7 @@ public class HttpServerConnection extends Thread {
} catch (IOException ex) {
}
}
log.log(Level.SEVERE, LOG_PREFIX + "Exception while handling request: ", e);
Log.severe("Exception while handling request: ", e);
e.printStackTrace();
return;
}

1
src/main/java/org/dynmap/web/Json.java
View file

@ -3,7 +3,6 @@ package org.dynmap.web;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;