Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-25 10:07:37 +01:00
Code Issues Projects Releases Wiki Activity

New config to Disable Webserver

Browse Source 
New feature and config to output JSON to file
This commit is contained in:
Jason Booth 2011-02-09 11:35:09 -06:00
parent b2f6ae5132
commit fb01f6ecf7
2 changed files with 75 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configuration.txt
View File

@ -15,6 +15,15 @@ webserver-bindaddress: 0.0.0.0
# The TCP-port the webserver will listen on. # The TCP-port the webserver will listen on.
webserver-port: 8123 webserver-port: 8123
# Disables Webserver portion of Dynmap (Advanced users only)
disable-webserver: true
# Writes JSON to file in the webpath
jsonfile: true
# How often the json file gets written to(in seconds)
jsonfile-interval: 1000
disabledcommands: disabledcommands:
- fullrender - fullrender

88
src/main/java/org/dynmap/DynmapPlugin.java
View File

@ -1,11 +1,14 @@
package org.dynmap; package org.dynmap;
import java.io.File; import java.io.File;
import java.io.FileOutputStream;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.Timer;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
@ -22,6 +25,7 @@ import org.dynmap.web.HttpServer;
import org.dynmap.web.handlers.ClientConfigurationHandler; import org.dynmap.web.handlers.ClientConfigurationHandler;
import org.dynmap.web.handlers.ClientUpdateHandler; import org.dynmap.web.handlers.ClientUpdateHandler;
import org.dynmap.web.handlers.FilesystemHandler; import org.dynmap.web.handlers.FilesystemHandler;
import org.dynmap.web.Json;
public class DynmapPlugin extends JavaPlugin { public class DynmapPlugin extends JavaPlugin {
@ -32,6 +36,8 @@ public class DynmapPlugin extends JavaPlugin {
private PlayerList playerList; private PlayerList playerList;
private Configuration configuration; private Configuration configuration;
private Timer timer;
private BukkitPlayerDebugger debugger = new BukkitPlayerDebugger(this); private BukkitPlayerDebugger debugger = new BukkitPlayerDebugger(this);
public static File dataRoot; public static File dataRoot;
@ -64,31 +70,43 @@ public class DynmapPlugin extends JavaPlugin {
mapManager = new MapManager(getWorld(), debugger, configuration); mapManager = new MapManager(getWorld(), debugger, configuration);
mapManager.startManager(); mapManager.startManager();
InetAddress bindAddress; if(!configuration.getBoolean("disable-webserver", true)) {
{ InetAddress bindAddress;
String address = configuration.getString("webserver-bindaddress", "0.0.0.0"); {
try { String address = configuration.getString("webserver-bindaddress", "0.0.0.0");
bindAddress = address.equals("0.0.0.0") try {
? null bindAddress = address.equals("0.0.0.0")
: InetAddress.getByName(address); ? null
} catch (UnknownHostException e) { : InetAddress.getByName(address);
bindAddress = null; } catch (UnknownHostException e) {
} bindAddress = null;
} }
int port = configuration.getInt("webserver-port", 8123); }
int port = configuration.getInt("webserver-port", 8123);
webServer = new HttpServer(bindAddress, port); webServer = new HttpServer(bindAddress, port);
webServer.handlers.put("/", new FilesystemHandler(mapManager.webDirectory)); webServer.handlers.put("/", new FilesystemHandler(mapManager.webDirectory));
webServer.handlers.put("/tiles/", new FilesystemHandler(mapManager.tileDirectory)); webServer.handlers.put("/tiles/", new FilesystemHandler(mapManager.tileDirectory));
webServer.handlers.put("/up/", new ClientUpdateHandler(mapManager, playerList, getWorld())); webServer.handlers.put("/up/", new ClientUpdateHandler(mapManager, playerList, getWorld()));
webServer.handlers.put("/up/configuration", new ClientConfigurationHandler((Map<?, ?>) configuration.getProperty("web"))); webServer.handlers.put("/up/configuration", new ClientConfigurationHandler((Map<?, ?>) configuration.getProperty("web")));
try { try {
webServer.startServer(); webServer.startServer();
} catch (IOException e) { } catch (IOException e) {
log.severe("Failed to start WebServer on " + bindAddress + ":" + port + "!"); log.severe("Failed to start WebServer on " + bindAddress + ":" + port + "!");
} }
}
else
System.out.println("WebServer Disabled");
if(configuration.getBoolean("jsonfile", false)) {
jsonConfig();
int jsonInterval = configuration.getInt("jsonfile", 1) * 1000;
timer = new Timer();
timer.scheduleAtFixedRate(new JsonTimerTask(this, configuration), jsonInterval, jsonInterval);
}
else
System.out.println("JsonFile Writing Disabled");
registerEvents(); registerEvents();
} }
@ -111,4 +129,30 @@ public class DynmapPlugin extends JavaPlugin {
getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, playerListener, Priority.Normal, this); getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, playerListener, Priority.Normal, this);
getServer().getPluginManager().registerEvent(Event.Type.PLAYER_CHAT, playerListener, Priority.Normal, this); getServer().getPluginManager().registerEvent(Event.Type.PLAYER_CHAT, playerListener, Priority.Normal, this);
} }
private void jsonConfig()
{
File outputFile;
Map<?, ?> clientConfig = (Map<?, ?>) configuration.getProperty("web");
File webpath = new File(configuration.getString("webpath", "web"), "dynmap_config.json");
if(webpath.isAbsolute())
outputFile = webpath;
else
outputFile = new File(DynmapPlugin.dataRoot, webpath.toString());
try
{
FileOutputStream fos = new FileOutputStream(outputFile);
fos.write(Json.stringifyJson(clientConfig).getBytes());
fos.close();
}
catch(FileNotFoundException ex)
{
System.out.println("FileNotFoundException : " + ex);
}
catch(IOException ioe)
{
System.out.println("IOException : " + ioe);
}
}
} }