ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Changed to disable plugins by default

Browse source
This commit is contained in:
Ziver Koc 2022-05-20 12:00:06 +02:00
parent 78e2edd4e9
commit 3a278b0ca6
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hal-core/src/se/hal/HalServer.java
View file

@ -85,7 +85,14 @@ public class HalServer {
for (PluginData plugin : getAllPlugins()) { for (PluginData plugin : getAllPlugins()) {
PluginConfig pluginConfig = PluginConfig.getPluginConfig(db, plugin.getName()); PluginConfig pluginConfig = PluginConfig.getPluginConfig(db, plugin.getName());
if (pluginConfig != null && !pluginConfig.isEnabled() && !plugin.getName().equals("Hal-Core")) { // If plugin is not found in DB then disable it and create an entry.
if (pluginConfig == null) {
pluginConfig = new PluginConfig(plugin.getName());
pluginConfig.setEnabled(false);
pluginConfig.save(db);
}
if (!pluginConfig.isEnabled() && !plugin.getName().equals("Hal-Core")) {
logger.info("Disabling plugin '" + plugin.getName() + "'."); logger.info("Disabling plugin '" + plugin.getName() + "'.");
plugin.setEnabled(false); plugin.setEnabled(false);
} }
@ -126,7 +133,10 @@ public class HalServer {
HalWebPage.getRootNav().createSubNav("Events").setWeight(100); HalWebPage.getRootNav().createSubNav("Events").setWeight(100);
HalWebPage.getRootNav().createSubNav("Settings").setWeight(200); HalWebPage.getRootNav().createSubNav("Settings").setWeight(200);
http.setDefaultPage(new HttpFilePage(FileUtil.find(HalContext.RESOURCE_WEB_ROOT))); HttpFilePage filePage = new HttpFilePage(FileUtil.find(HalContext.RESOURCE_WEB_ROOT));
filePage.disableCaching(".*\\.m3u8");
http.setDefaultPage(filePage);
http.setPage("/", new HttpRedirectPage("/map")); http.setPage("/", new HttpRedirectPage("/map"));
http.setPage(HalAlertManager.getInstance().getUrl(), HalAlertManager.getInstance()); http.setPage(HalAlertManager.getInstance().getUrl(), HalAlertManager.getInstance());
@ -153,9 +163,9 @@ public class HalServer {
pluginConfig = new PluginConfig(name); pluginConfig = new PluginConfig(name);
logger.info("Plugin '" + name + "' has been " + (enabled ? "enabled" : "disabled") + ", change will take affect after restart."); logger.info("Plugin '" + name + "' has been " + (enabled ? "enabled" : "disabled") + ", change will take affect after restart.");
pluginManager.getPluginData(name).setEnabled(enabled);
pluginConfig.setEnabled(enabled); pluginConfig.setEnabled(enabled);
pluginManager.getPluginData(name).setEnabled(pluginConfig.isEnabled());
pluginConfig.save(db); pluginConfig.save(db);
} }