From b297581d3d20c5f2d5574cf29c5e24b56c60e092 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Thu, 3 Sep 2020 16:21:53 +0200 Subject: [PATCH 1/5] logging --- src/main/resources/log4j2.properties | 12 ++++++++++++ .../resources/{log4j2.xml => log4j2.xml-disabled} | 0 2 files changed, 12 insertions(+) create mode 100644 src/main/resources/log4j2.properties rename src/main/resources/{log4j2.xml => log4j2.xml-disabled} (100%) diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties new file mode 100644 index 0000000..2f6d23d --- /dev/null +++ b/src/main/resources/log4j2.properties @@ -0,0 +1,12 @@ +log4j.rootLogger=DEBUG, ConsoleAppender, FileAppender + +log4j.appender.ConsoleAppender=org.apache.log4j.ConsoleAppender +log4j.appender.ConsoleAppender.Target=System.err +log4j.appender.ConsoleAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.ConsoleAppender.layout.ConversionPattern=%d [%t, %F, %L] %-5level - %msg%n%throwable + +log4j.appender.FileAppender=org.apache.log4j.RollingFileAppender +log4j.appender.FileAppender.File=/tmp/mbusmaster.log +log4j.appender.FileAppender.MaxFileSize=2048KB +log4j.appender.FileAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.FileAppender.layout.ConversionPattern=%d [%t, %F, %L] %-5level - %msg%n%throwable diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml-disabled similarity index 100% rename from src/main/resources/log4j2.xml rename to src/main/resources/log4j2.xml-disabled From 0d5e44b2e890f9e3e069807b4ac519c594795a9b Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Thu, 3 Sep 2020 16:26:43 +0200 Subject: [PATCH 2/5] fix --- src/main/resources/{log4j2.properties => log4j2.props} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/{log4j2.properties => log4j2.props} (100%) diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.props similarity index 100% rename from src/main/resources/log4j2.properties rename to src/main/resources/log4j2.props From 63355cb1f859d29ba181522b5be6840c417fc96d Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Thu, 3 Sep 2020 16:29:48 +0200 Subject: [PATCH 3/5] fix --- src/main/resources/{log4j2.props => log4j2.properties} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/{log4j2.props => log4j2.properties} (100%) diff --git a/src/main/resources/log4j2.props b/src/main/resources/log4j2.properties similarity index 100% rename from src/main/resources/log4j2.props rename to src/main/resources/log4j2.properties From db4d4ff46b13605743b625942ad152d1ff04bff1 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Thu, 3 Sep 2020 17:03:54 +0200 Subject: [PATCH 4/5] changes --- readme.md | 4 ++++ src/main/resources/log4j2.properties | 12 ------------ .../resources/{log4j2.xml-disabled => log4j2.xml} | 3 ++- 3 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 src/main/resources/log4j2.properties rename src/main/resources/{log4j2.xml-disabled => log4j2.xml} (89%) diff --git a/readme.md b/readme.md index cd76bcb..de39772 100644 --- a/readme.md +++ b/readme.md @@ -3,3 +3,7 @@ To build the jar: mvn clean compile assembly:single + +To start: + +java -Dlog4j.configurationFile=./conf/log4j2.xml -jar mbusMaster-1.0-SNAPSHOT-jar-with-dependencies.jar \ No newline at end of file diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties deleted file mode 100644 index 2f6d23d..0000000 --- a/src/main/resources/log4j2.properties +++ /dev/null @@ -1,12 +0,0 @@ -log4j.rootLogger=DEBUG, ConsoleAppender, FileAppender - -log4j.appender.ConsoleAppender=org.apache.log4j.ConsoleAppender -log4j.appender.ConsoleAppender.Target=System.err -log4j.appender.ConsoleAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.ConsoleAppender.layout.ConversionPattern=%d [%t, %F, %L] %-5level - %msg%n%throwable - -log4j.appender.FileAppender=org.apache.log4j.RollingFileAppender -log4j.appender.FileAppender.File=/tmp/mbusmaster.log -log4j.appender.FileAppender.MaxFileSize=2048KB -log4j.appender.FileAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.FileAppender.layout.ConversionPattern=%d [%t, %F, %L] %-5level - %msg%n%throwable diff --git a/src/main/resources/log4j2.xml-disabled b/src/main/resources/log4j2.xml similarity index 89% rename from src/main/resources/log4j2.xml-disabled rename to src/main/resources/log4j2.xml index 3e6281e..248a605 100644 --- a/src/main/resources/log4j2.xml-disabled +++ b/src/main/resources/log4j2.xml @@ -3,13 +3,14 @@ + - + From 4daf09e4693cc4076875d153e0e5d50b4b5fe935 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Thu, 3 Sep 2020 17:06:31 +0200 Subject: [PATCH 5/5] fix --- src/main/java/de/hottis/mbusMaster/MbusMaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/hottis/mbusMaster/MbusMaster.java b/src/main/java/de/hottis/mbusMaster/MbusMaster.java index 6a531b5..7a92684 100644 --- a/src/main/java/de/hottis/mbusMaster/MbusMaster.java +++ b/src/main/java/de/hottis/mbusMaster/MbusMaster.java @@ -51,7 +51,7 @@ public class MbusMaster { } System.out.println(); } catch (IOException e) { - logger.error("Error " + e.toString() + ", " + e.getMessage() + " in Meterbus dialog for device " + device); + logger.error("Error " + e.toString() + " in Meterbus dialog for device " + device); } } // if (cnt >= 10) {