Remove metrics.enabled check from configuration

Author: renvins

bukkit/src/main/java/it/renvins/serverpulse/bukkit/ServerPulseBukkitLoader.java

@@ -25,6 +25,8 @@
 import it.renvins.serverpulse.bukkit.platform.BukkitPlatform;
 import it.renvins.serverpulse.bukkit.scheduler.BukkitTaskScheduler;
 import it.renvins.serverpulse.common.MetricsService;
+import it.renvins.serverpulse.common.platform.Platform;
+import it.renvins.serverpulse.common.scheduler.TaskScheduler;
 
 public class ServerPulseBukkitLoader implements Service {
 
@@ -33,6 +35,8 @@ public class ServerPulseBukkitLoader implements Service {
 
     private final BukkitConfiguration config;
 
+    private final Platform platform;
+
     private final IDatabaseService databaseService;
     private final IMetricsService metricsService;
 
@@ -48,8 +52,8 @@ public ServerPulseBukkitLoader(ServerPulseBukkit plugin) {
 
         PulseLogger logger = new BukkitLogger(LOGGER);
 
-        BukkitPlatform platform = new BukkitPlatform(plugin);
-        BukkitTaskScheduler taskScheduler = new BukkitTaskScheduler(plugin);
+        this.platform = new BukkitPlatform(plugin);
+        TaskScheduler taskScheduler = new BukkitTaskScheduler(plugin);
 
         DatabaseConfiguration databaseConfiguration = new BukkitDatabaseConfiguration(config);
         MetricsConfiguration metricsConfiguration = new BukkitMetricsConfiguration(config);
@@ -71,16 +75,10 @@ public void load() {
         LOGGER.info("Loading configuration...");
         config.load();
 
-        if(!config.getConfig().getBoolean("metrics.enabled")) {
-            LOGGER.severe("Shutting down the plugin because metrics are disabled!");
-            plugin.getServer().getPluginManager().disablePlugin(plugin);
-
-            return;
-        }
         ServerPulseProvider.register(new ServerPulseBukkitAPI(databaseService, metricsService, tpsRetriever, diskRetriever, pingRetriever));
 
         databaseService.load();
-        if (!plugin.isEnabled()) {
+        if (!platform.isEnabled()) {
             return;
         }
         metricsService.load();

bukkit/src/main/resources/config.yml

@@ -1,5 +1,4 @@
 metrics:
-  enabled: true
   interval: 5
   influxdb:
     url: http://localhost:8086 # The URL of the InfluxDB API

velocity/src/main/java/it/renvins/serverpulse/velocity/ServerPulseVelocity.java

@@ -64,12 +64,6 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
         logger.info("Loading configuration file...");
         config.load();
 
-        if(!config.getConfig().getBoolean("metrics.enabled")) {
-            logger.error("Shutting down the plugin because metrics are disabled!");
-            server.shutdown();
-
-            return;
-        }
         DatabaseConfiguration dbConfig = new VelocityDatabaseConfiguration(config);
         MetricsConfiguration metricsConfig = new VelocityMetricsConfiguration(config);
 

velocity/src/main/resources/config.yml

@@ -1,5 +1,4 @@
 metrics:
-  enabled: true
   interval: 5
   influxdb:
     url: http://localhost:8086 # The URL of the InfluxDB API