Keep webserver running if bluemap disables due to no active maps being configured
This commit is contained in:
parent
892506f2f9
commit
631c409f79
|
@ -153,14 +153,6 @@ public class Plugin implements ServerEventListener {
|
||||||
worlds = blueMap.getWorlds();
|
worlds = blueMap.getWorlds();
|
||||||
maps = blueMap.getMaps();
|
maps = blueMap.getMaps();
|
||||||
|
|
||||||
//warn if no maps are configured
|
|
||||||
if (maps.isEmpty()) {
|
|
||||||
Logger.global.logWarning("There are no valid maps configured, please check your map-configs! Disabling BlueMap...");
|
|
||||||
|
|
||||||
unload();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//create and start webserver
|
//create and start webserver
|
||||||
if (webserverConfig.isEnabled()) {
|
if (webserverConfig.isEnabled()) {
|
||||||
Path webroot = webserverConfig.getWebroot();
|
Path webroot = webserverConfig.getWebroot();
|
||||||
|
@ -209,6 +201,13 @@ public class Plugin implements ServerEventListener {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//warn if no maps are configured
|
||||||
|
if (maps.isEmpty()) {
|
||||||
|
Logger.global.logWarning("There are no valid maps configured, please check your map-configs! Disabling BlueMap...");
|
||||||
|
unload(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
//initialize render manager
|
//initialize render manager
|
||||||
renderManager = new RenderManager();
|
renderManager = new RenderManager();
|
||||||
|
|
||||||
|
@ -341,6 +340,9 @@ public class Plugin implements ServerEventListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void unload() {
|
public void unload() {
|
||||||
|
this.unload(false);
|
||||||
|
}
|
||||||
|
public void unload(boolean keepWebserver) {
|
||||||
loadingLock.interruptAndLock();
|
loadingLock.interruptAndLock();
|
||||||
try {
|
try {
|
||||||
synchronized (this) {
|
synchronized (this) {
|
||||||
|
@ -377,14 +379,14 @@ public class Plugin implements ServerEventListener {
|
||||||
}
|
}
|
||||||
renderManager = null;
|
renderManager = null;
|
||||||
|
|
||||||
if (webServer != null) {
|
if (webServer != null && !keepWebserver) {
|
||||||
try {
|
try {
|
||||||
webServer.close();
|
webServer.close();
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
Logger.global.logError("Failed to close the webserver!", ex);
|
Logger.global.logError("Failed to close the webserver!", ex);
|
||||||
}
|
}
|
||||||
|
webServer = null;
|
||||||
}
|
}
|
||||||
webServer = null;
|
|
||||||
|
|
||||||
//close bluemap
|
//close bluemap
|
||||||
if (blueMap != null) {
|
if (blueMap != null) {
|
||||||
|
|
Loading…
Reference in New Issue