From 56faa20aef6e00328895e89631d1f8b8b2ad86bb Mon Sep 17 00:00:00 2001 From: Thomas Rudin Date: Tue, 6 Nov 2018 13:13:20 +0100 Subject: [PATCH] add debug config option --- .../io/rudin/minetest/tileserver/TileServer.java | 13 +++++++++++-- .../tileserver/config/TileServerConfig.java | 8 ++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/rudin/minetest/tileserver/TileServer.java b/src/main/java/io/rudin/minetest/tileserver/TileServer.java index ab7be69..6dc9a15 100644 --- a/src/main/java/io/rudin/minetest/tileserver/TileServer.java +++ b/src/main/java/io/rudin/minetest/tileserver/TileServer.java @@ -4,6 +4,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import ch.qos.logback.classic.Level; import com.google.inject.Guice; import com.google.inject.Injector; @@ -35,6 +36,14 @@ public class TileServer { TileServerConfig cfg = ConfigFactory.create(TileServerConfig.class); + if (cfg.enableDebug()){ + TileServer.logger.warn("Enabling debug/logging mode"); + + Logger logger = LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); + ch.qos.logback.classic.Logger loggerImpl = (ch.qos.logback.classic.Logger)logger; + + loggerImpl.setLevel(Level.DEBUG); + } Injector injector = Guice.createInjector( new ConfigModule(cfg), @@ -51,7 +60,7 @@ public class TileServer { } else { //Static files specified, DEV mode - logger.warn("Using external static file location: '{}'", cfg.staticFilesLocation()); + TileServer.logger.warn("Using external static file location: '{}'", cfg.staticFilesLocation()); externalStaticFileLocation(cfg.staticFilesLocation()); } @@ -60,7 +69,7 @@ public class TileServer { HTTPServer promServer = null; if (cfg.prometheusEnable()) { - logger.info("Starting prometheus metrics server at port {}", cfg.prometheusPort()); + TileServer.logger.info("Starting prometheus metrics server at port {}", cfg.prometheusPort()); promServer = new HTTPServer(cfg.prometheusPort()); DefaultExports.initialize(); } diff --git a/src/main/java/io/rudin/minetest/tileserver/config/TileServerConfig.java b/src/main/java/io/rudin/minetest/tileserver/config/TileServerConfig.java index 1aa4354..0c1a83f 100644 --- a/src/main/java/io/rudin/minetest/tileserver/config/TileServerConfig.java +++ b/src/main/java/io/rudin/minetest/tileserver/config/TileServerConfig.java @@ -176,4 +176,12 @@ public interface TileServerConfig extends Config { @DefaultValue("org.postgresql.Driver") String tileDatabaseDriver(); + /* + Debug stuff + */ + + @Key("debug.enable") + @DefaultValue("true") + boolean enableDebug(); + }