From 4fa5448e1c886cdde8f421df805152d392e5b9da Mon Sep 17 00:00:00 2001
From: RatzzFatzz <github.contact@ratzloeffel.de>
Date: Mon, 3 Feb 2025 01:13:15 +0100
Subject: [PATCH] Fix logging on installed app

---
 pom.xml                                  | 173 +++++++++++++----------
 src/main/resources/log4j2-dev.yaml       |   8 +-
 src/main/resources/log4j2-installed.yaml |  31 ++++
 src/main/resources/log4j2.yaml           |   8 +-
 4 files changed, 141 insertions(+), 79 deletions(-)
 create mode 100644 src/main/resources/log4j2-installed.yaml

diff --git a/pom.xml b/pom.xml
index 50803d3..a43200b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,18 +16,61 @@
 
     <profiles>
         <profile>
-            <id>windows</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
+            <id>portable</id>
             <build>
+                <resources>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                        <includes>
+                            <include>log4j2.yml</include>
+                            <include>log4j2-debug.yml</include>
+                        </includes>
+                    </resource>
+                </resources>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>3.3.0</version>
+                        <executions>
+                            <execution>
+                                <id>archive</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <appendAssemblyId>false</appendAssemblyId>
+                                    <descriptors>
+                                        <descriptor>maven/assembly.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>windows</id>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                        <includes>
+                            <include>log4j2-installed.yaml</include>
+                        </includes>
+                    </resource>
+                </resources>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>3.3.1</version>
+                    </plugin>
                     <plugin>
                         <groupId>org.panteleyev</groupId>
                         <artifactId>jpackage-maven-plugin</artifactId>
-                        <version>1.4.0</version>
+                        <version>1.6.5</version>
                         <executions>
                             <execution>
                                 <id>windows</id>
@@ -37,6 +80,9 @@
                                     <winConsole>true</winConsole>
                                     <winShortcut>false</winShortcut>
                                     <winMenu>false</winMenu>
+                                    <javaOptions>
+                                        <javaOption>-Dlog4j.configurationFile=log4j2-installed.yaml</javaOption>
+                                    </javaOptions>
                                 </configuration>
                                 <phase>package</phase>
                                 <goals>
@@ -50,11 +96,6 @@
         </profile>
         <profile>
             <id>linux</id>
-            <activation>
-                <os>
-                    <family>linux</family>
-                </os>
-            </activation>
             <build>
                 <plugins>
                     <plugin>
@@ -88,9 +129,6 @@
         <sourceDirectory>src/main/java</sourceDirectory>
         <testSourceDirectory>src/test/java</testSourceDirectory>
         <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
             <resource>
                 <directory>./</directory>
                 <includes>
@@ -178,68 +216,53 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.1</version>
-                <executions>
-                    <execution>
-                        <id>copy-jpackage-input</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/jpackage-input</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.build.directory}</directory>
-                                    <includes>
-                                        <include>${project.artifactId}-${project.version}.jar</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
-                <executions>
-                    <execution>
-                        <id>archive</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>maven/assembly.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
 
-            <plugin>
-                <groupId>org.panteleyev</groupId>
-                <artifactId>jpackage-maven-plugin</artifactId>
-                <version>1.4.0</version>
-                <configuration>
-                    <name>${project.artifactId}</name>
-                    <vendor>RatzzFatzz</vendor>
-                    <appVersion>${project.version}</appVersion>
-
-                    <destination>target/installer</destination>
-
-                    <input>target/jpackage-input</input>
-                    <mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass>
-                    <mainJar>${project.artifactId}-${project.version}.jar</mainJar>
-                </configuration>
-            </plugin>
         </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.3.1</version>
+                    <executions>
+                        <execution>
+                            <id>copy-jpackage-input</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>copy-resources</goal>
+                            </goals>
+                            <configuration>
+                                <outputDirectory>${project.build.directory}/jpackage-input</outputDirectory>
+                                <resources>
+                                    <resource>
+                                        <directory>${project.build.directory}</directory>
+                                        <includes>
+                                            <include>${project.artifactId}-${project.version}.jar</include>
+                                        </includes>
+                                    </resource>
+                                </resources>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.panteleyev</groupId>
+                    <artifactId>jpackage-maven-plugin</artifactId>
+                    <version>1.4.0</version>
+                    <configuration>
+                        <name>${project.artifactId}</name>
+                        <vendor>RatzzFatzz</vendor>
+                        <appVersion>${project.version}</appVersion>
+
+                        <destination>target/installer</destination>
+
+                        <input>target/jpackage-input</input>
+                        <mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass>
+                        <mainJar>${project.artifactId}-${project.version}.jar</mainJar>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <repositories>
diff --git a/src/main/resources/log4j2-dev.yaml b/src/main/resources/log4j2-dev.yaml
index bd94532..e2b4377 100644
--- a/src/main/resources/log4j2-dev.yaml
+++ b/src/main/resources/log4j2-dev.yaml
@@ -7,13 +7,17 @@ Configuration:
         Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
       ThresholdFilter:
         level: debug
-    File:
+    RollingFile:
       name: FileAppender
-      fileName: default.log
+      fileName: logs/application.log
+      filePattern: logs/archive/application-%d{yyyy-MM-dd}-%i.log
       PatternLayout:
         Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
       ThresholdFilter:
         level: debug
+      Policies:
+        OnStartupTriggeringPolicy:
+          minSize: 0
   Loggers:
     Root:
       level: debug
diff --git a/src/main/resources/log4j2-installed.yaml b/src/main/resources/log4j2-installed.yaml
new file mode 100644
index 0000000..17494b5
--- /dev/null
+++ b/src/main/resources/log4j2-installed.yaml
@@ -0,0 +1,31 @@
+Configuration:
+  name: DefaultLogger
+  Appenders:
+    File:
+      name: FileAppender
+      fileName: ${sys:user.home}/AppData/Roaming/MyApplication/MyApplication.log
+      PatternLayout:
+        Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
+      ThresholdFilter:
+        level: info
+    RollingFile:
+      name: FileAppender
+      fileName: ${sys:user.home}/AppData/Roaming/MKVAudioSubtitleChanger/logs/application.log
+      filePattern: ${sys:user.home}/AppData/Roaming/MKVAudioSubtitleChanger/logs/archive/application-%d{yyyy-MM-dd}-%i.log
+      PatternLayout:
+        Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
+      ThresholdFilter:
+        level: info
+      Policies:
+        OnStartupTriggeringPolicy:
+          minSize: 0
+  Loggers:
+    Root:
+      level: info
+      AppenderRef:
+        - ref: FileAppender
+    Logger:
+      name: "com.zaxxer.hikari.HikariConfig"
+      level: info
+      AppenderRef:
+        - ref: FileAppender
\ No newline at end of file
diff --git a/src/main/resources/log4j2.yaml b/src/main/resources/log4j2.yaml
index 371b601..7a1dc2d 100644
--- a/src/main/resources/log4j2.yaml
+++ b/src/main/resources/log4j2.yaml
@@ -1,13 +1,17 @@
 Configuration:
   name: DefaultLogger
   Appenders:
-    File:
+    RollingFile:
       name: FileAppender
-      fileName: default.log
+      fileName: logs/application.log
+      filePattern: logs/archive/application-%d{yyyy-MM-dd}-%i.log
       PatternLayout:
         Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
       ThresholdFilter:
         level: info
+      Policies:
+        OnStartupTriggeringPolicy:
+          minSize: 0
   Loggers:
     Root:
       level: info