Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-09-28 13:47:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3216 from 811Alex/misconfwarn

Browse Source 
Add warning for ClientUpdateComponent misconfiguration, related to disable-webserver
This commit is contained in:
mikeprimm 2020-12-30 18:50:46 -06:00 committed by GitHub
commit 5e5316d1e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DynmapCore/src/main/java/org/dynmap/ComponentManager.java
View File

@ -6,6 +6,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.StreamSupport;
public class ComponentManager { public class ComponentManager {
public Set<Component> components = new HashSet<Component>(); public Set<Component> components = new HashSet<Component>();
@ -38,10 +39,14 @@ public class ComponentManager {
components.clear(); components.clear();
} }
public Iterable<Component> getComponents(Class<Component> c) { public Iterable<Component> getComponents(Class<? extends Component> c) {
List<Component> list = componentLookup.get(c.toString()); List<Component> list = componentLookup.get(c.toString());
if (list == null) if (list == null)
return new ArrayList<Component>(); return new ArrayList<Component>();
return list; return list;
} }
public Boolean isLoaded(Class<? extends Component> c){
return StreamSupport.stream(getComponents(c).spliterator(), false).count() > 0;
}
} }

24
DynmapCore/src/main/java/org/dynmap/DynmapCore.java
View File

@ -159,6 +159,9 @@ public class DynmapCore implements DynmapCommonAPI {
private String[] deftriggers = { }; private String[] deftriggers = { };
private Boolean webserverCompConfigWarn = false;
private final String CompConfigWiki = "https://github.com/webbukkit/dynmap/wiki/Component-Configuration";
/* Constructor for core */ /* Constructor for core */
public DynmapCore() { public DynmapCore() {
} }
@ -615,6 +618,27 @@ public class DynmapCore implements DynmapCommonAPI {
if (!configuration.getBoolean("disable-webserver", false)) { if (!configuration.getBoolean("disable-webserver", false)) {
startWebserver(); startWebserver();
if(!componentManager.isLoaded(InternalClientUpdateComponent.class)) {
Log.warning("Using internal server, but " + InternalClientUpdateComponent.class.toString() + " is DISABLED!");
webserverCompConfigWarn = true;
}
if(componentManager.isLoaded(JsonFileClientUpdateComponent.class)) {
Log.warning("Using internal server, but " + JsonFileClientUpdateComponent.class.toString() + " is ENABLED!");
}
}
else {
if(componentManager.isLoaded(InternalClientUpdateComponent.class)) {
Log.warning("Using external server, but " + InternalClientUpdateComponent.class.toString() + " is ENABLED!");
}
if(!componentManager.isLoaded(JsonFileClientUpdateComponent.class)) {
Log.warning("Using external server, but " + JsonFileClientUpdateComponent.class.toString() + " is DISABLED!");
webserverCompConfigWarn = true;
}
}
if(webserverCompConfigWarn){
Log.warning("If the website is missing files or not loading/updating, this might be why.");
Log.warning("For more info, read this: " + CompConfigWiki);
webserverCompConfigWarn = false;
} }
/* Add login/logoff listeners */ /* Add login/logoff listeners */