From e55f8d3e6d5433a6fa2f882eabd4fd99a0ede0c1 Mon Sep 17 00:00:00 2001 From: Preawpan Thamapipol <80502090+Tezigudo@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:29:55 +0900 Subject: [PATCH 1/4] ready to analyze --- .gitignore | 1 + pom.xml | 3 +++ src/integrationtest/log4j.properties | 28 ++++++++++++++++++---- src/test/resources/log4j.properties | 28 ++++++++++++++++++---- src/test/resources/logback.xml | 35 ++++++++++++++++++++++++---- 5 files changed, 82 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index aee1dd39d..24ff7b219 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ build/ /.metadata/ /.packages /.dart_tool/ +logs/ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 655e57966..a9cd29d3e 100644 --- a/pom.xml +++ b/pom.xml @@ -85,6 +85,9 @@ UTF-8 + 11 + ${java.version} + ${java.version} diff --git a/src/integrationtest/log4j.properties b/src/integrationtest/log4j.properties index d35b4c93b..1f9fd34d7 100644 --- a/src/integrationtest/log4j.properties +++ b/src/integrationtest/log4j.properties @@ -1,6 +1,26 @@ -log4j.rootCategory=INFO, Console -log4j.category.org.asteriskjava.live=DEBUG - +# Define appenders log4j.appender.Console=org.apache.log4j.ConsoleAppender +log4j.appender.Console.target=System.out log4j.appender.Console.layout=org.apache.log4j.PatternLayout -log4j.appender.Console.layout.ConversionPattern=%d %c %p [%t] - %m\n \ No newline at end of file +log4j.appender.Console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} | [%t] | %-5p | %c{36}:%L | %m%n + +log4j.appender.File=org.apache.log4j.FileAppender +log4j.appender.File.File=logs/trace.log +log4j.appender.File.layout=org.apache.log4j.PatternLayout +log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} | [%t] | %-5p | %c{36}:%L | %m%n + +log4j.appender.Error=org.apache.log4j.FileAppender +log4j.appender.Error.File=logs/error.log +log4j.appender.Error.layout=org.apache.log4j.PatternLayout +log4j.appender.Error.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} | [%t] | %-5p | %c{36}:%L | %m%n + +# Root logger configuration +log4j.rootLogger=TRACE, File, Console, Error + +# Hibernate logger configuration +log4j.logger.org.hibernate=ERROR, Error +log4j.additivity.org.hibernate=false + +# Log all SQL statements +log4j.logger.org.hibernate.SQL=INFO, File +log4j.additivity.org.hibernate.SQL=false diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties index d35b4c93b..1f9fd34d7 100644 --- a/src/test/resources/log4j.properties +++ b/src/test/resources/log4j.properties @@ -1,6 +1,26 @@ -log4j.rootCategory=INFO, Console -log4j.category.org.asteriskjava.live=DEBUG - +# Define appenders log4j.appender.Console=org.apache.log4j.ConsoleAppender +log4j.appender.Console.target=System.out log4j.appender.Console.layout=org.apache.log4j.PatternLayout -log4j.appender.Console.layout.ConversionPattern=%d %c %p [%t] - %m\n \ No newline at end of file +log4j.appender.Console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} | [%t] | %-5p | %c{36}:%L | %m%n + +log4j.appender.File=org.apache.log4j.FileAppender +log4j.appender.File.File=logs/trace.log +log4j.appender.File.layout=org.apache.log4j.PatternLayout +log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} | [%t] | %-5p | %c{36}:%L | %m%n + +log4j.appender.Error=org.apache.log4j.FileAppender +log4j.appender.Error.File=logs/error.log +log4j.appender.Error.layout=org.apache.log4j.PatternLayout +log4j.appender.Error.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} | [%t] | %-5p | %c{36}:%L | %m%n + +# Root logger configuration +log4j.rootLogger=TRACE, File, Console, Error + +# Hibernate logger configuration +log4j.logger.org.hibernate=ERROR, Error +log4j.additivity.org.hibernate=false + +# Log all SQL statements +log4j.logger.org.hibernate.SQL=INFO, File +log4j.additivity.org.hibernate.SQL=false diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml index 757aa32de..4b3ea0fe5 100644 --- a/src/test/resources/logback.xml +++ b/src/test/resources/logback.xml @@ -1,10 +1,35 @@ - + - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} | [%thread] | %-5level | %logger{36}:%line | %msg%n - - + + + logs/trace.log + + %d{yyyy-MM-dd HH:mm:ss.SSS} | [%thread] | %-5level | %logger{36}:%line | %msg%n + + + + + logs/error.log + + %d{yyyy-MM-dd HH:mm:ss.SSS} | [%thread] | %-5level | %logger{36}:%line | %msg%n + + + + + + + - \ No newline at end of file + + + + + + + + + From c561ee4897a699ef0f036ae2948072654d9e48d6 Mon Sep 17 00:00:00 2001 From: Preawpan Thamapipol <80502090+Tezigudo@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:51:23 +0900 Subject: [PATCH 2/4] fix bucket --- .../org/asteriskjava/pbx/internal/core/AsteriskPBX.java | 4 ++-- .../asteriskjava/pbx/internal/core/LiveChannelManager.java | 6 +++--- src/main/java/org/asteriskjava/pbx/internal/core/Peer.java | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/asteriskjava/pbx/internal/core/AsteriskPBX.java b/src/main/java/org/asteriskjava/pbx/internal/core/AsteriskPBX.java index 9147f06e7..6f0798947 100644 --- a/src/main/java/org/asteriskjava/pbx/internal/core/AsteriskPBX.java +++ b/src/main/java/org/asteriskjava/pbx/internal/core/AsteriskPBX.java @@ -252,9 +252,9 @@ public void hangup(final Channel channel) throws PBXException { logger.error(e, e); throw new PBXException(e); } - } else + } else { logger.debug("Suppressed hangup for " + channel + " as it was already hungup"); //$NON-NLS-1$ //$NON-NLS-2$ - + } } @Override diff --git a/src/main/java/org/asteriskjava/pbx/internal/core/LiveChannelManager.java b/src/main/java/org/asteriskjava/pbx/internal/core/LiveChannelManager.java index 46a1778bd..6e11a69cb 100644 --- a/src/main/java/org/asteriskjava/pbx/internal/core/LiveChannelManager.java +++ b/src/main/java/org/asteriskjava/pbx/internal/core/LiveChannelManager.java @@ -257,10 +257,10 @@ public void onManagerEvent(ManagerEvent event) { } - } else + } else { logger.error("Either the clone or original channelProxy was missing during a masquerade: cloneIndex=" - + cloneIndex + " originalIndex=" + originalIndex); - + + cloneIndex + " originalIndex=" + originalIndex); + } } if (event instanceof RenameEvent) { RenameEvent rename = (RenameEvent) event; diff --git a/src/main/java/org/asteriskjava/pbx/internal/core/Peer.java b/src/main/java/org/asteriskjava/pbx/internal/core/Peer.java index f06e87020..ae60ef001 100644 --- a/src/main/java/org/asteriskjava/pbx/internal/core/Peer.java +++ b/src/main/java/org/asteriskjava/pbx/internal/core/Peer.java @@ -125,9 +125,10 @@ public void handleEvent(final MasqueradeEvent b) { clone.mergeCalls(original); clone.setState(b.getCloneState()); this.evaluateState(); - } else + } else { logger.warn("When processing masquradeEvent we could not find the expected calls. event=" //$NON-NLS-1$ - + b.toString() + " original=" + original + " clone=" + clone); //$NON-NLS-1$ //$NON-NLS-2$ + + b.toString() + " original=" + original + " clone=" + clone); //$NON-NLS-1$ //$NON-NLS-2$ + } } } From 348b2ad1518379f6020b91137c9fc2b517927f3f Mon Sep 17 00:00:00 2001 From: Preawpan Thamapipol <80502090+Tezigudo@users.noreply.github.com> Date: Mon, 5 Aug 2024 11:41:56 +0900 Subject: [PATCH 3/4] fix bucket again --- .gitignore | 3 ++- .../pbx/internal/core/CoherentManagerConnection.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 24ff7b219..6bb2a06b4 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ build/ /.metadata/ /.packages /.dart_tool/ -logs/ \ No newline at end of file +logs/ +.DS_Store \ No newline at end of file diff --git a/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerConnection.java b/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerConnection.java index fd73f2fd8..e9427ba6a 100644 --- a/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerConnection.java +++ b/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerConnection.java @@ -102,8 +102,9 @@ class CoherentManagerConnection implements FilteredManagerListener public static synchronized void init() throws IllegalStateException, IOException, AuthenticationFailedException, TimeoutException, InterruptedException { - if (self != null) + if (self != null) { logger.warn("The CoherentManagerConnection has already been initialised"); + } else { self = new CoherentManagerConnection(); boolean done = false; From 28d8caaa00f74c7b71adf3111159b1022b5b7d7a Mon Sep 17 00:00:00 2001 From: Preawpan Thamapipol <80502090+Tezigudo@users.noreply.github.com> Date: Mon, 5 Aug 2024 11:48:30 +0900 Subject: [PATCH 4/4] fix bucket again --- .../org/asteriskjava/pbx/internal/asterisk/MeetmeRoom.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/asteriskjava/pbx/internal/asterisk/MeetmeRoom.java b/src/main/java/org/asteriskjava/pbx/internal/asterisk/MeetmeRoom.java index f01856574..987f743d0 100644 --- a/src/main/java/org/asteriskjava/pbx/internal/asterisk/MeetmeRoom.java +++ b/src/main/java/org/asteriskjava/pbx/internal/asterisk/MeetmeRoom.java @@ -50,8 +50,9 @@ public boolean addChannel(final Channel channel) { this.channels.add(channel); this.channelCount++; newChannel = true; - } else + } else { MeetmeRoom.logger.error("rejecting " + channel + " already in meetme."); //$NON-NLS-1$ //$NON-NLS-2$ + } return newChannel; } }