#698 configdir and logsdir

PBH-BTN · Nov 7, 2024 · f031d77 · f031d77
1 parent 9ee3145
commit f031d77
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/main/java/com/ghostchu/peerbanhelper/Main.java b/src/main/java/com/ghostchu/peerbanhelper/Main.java
@@ -151,14 +151,15 @@ public static void setupLogback() {
             appender.start(); // 启动 appender
         }
 
-        try{
+        try {
             var targetLevel = System.getProperty("pbh.log.level");
-            if(targetLevel != null) {
+            if (targetLevel != null) {
                 var rootLogger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
                 ch.qos.logback.classic.Logger logbackLogger = (ch.qos.logback.classic.Logger) rootLogger;
                 logbackLogger.setLevel(Level.toLevel(targetLevel));
             }
-        }catch (Throwable ignored){}
+        } catch (Throwable ignored) {
+        }
     }
 
     public static ReloadResult reloadModule() {
@@ -221,8 +222,14 @@ private static void setupConfDirectory(String[] args) {
         logsDirectory = new File(dataDirectory, "logs");
         configDirectory = new File(dataDirectory, "config");
         pluginDirectory = new File(dataDirectory, "plugins");
-        libraryDirectory = new File(dataDirectory, "libraries");
         debugDirectory = new File(dataDirectory, "debug");
+        if (System.getProperty("pbh.configdir") != null) {
+            configDirectory = new File(System.getProperty("pbh.configdir"));
+        }
+        if (System.getProperty("pbh.logsdir") != null) {
+            logsDirectory = new File(System.getProperty("pbh.logsdir"));
+        }
+        // other directories aren't allowed to change by user to keep necessary structure
     }
 
     private static YamlConfiguration loadConfiguration(File file) {