You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2017/10/17 15:22:59 UTC

[1/2] logging-log4j2 git commit: Revert "LOG4J2-2060 AbstractDatabaseManager should make a copy of LogEvents before holding references to them: AsyncLogger log events are mutable"

Repository: logging-log4j2
Updated Branches:
  refs/heads/master ff5e664cd -> 247c91d01


Revert "LOG4J2-2060 AbstractDatabaseManager should make a copy of LogEvents before holding references to them: AsyncLogger log events are mutable"

This reverts commit 334667c7acc2955e157572bfa3b8d0272a8f1495.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ecc2d35a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ecc2d35a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ecc2d35a

Branch: refs/heads/master
Commit: ecc2d35a4d3a90327d8a490edbd00ec8bfaeaea3
Parents: ff5e664
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Oct 17 08:43:25 2017 -0600
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Oct 17 08:43:25 2017 -0600

----------------------------------------------------------------------
 .../logging/log4j/core/appender/db/AbstractDatabaseManager.java   | 2 +-
 src/changes/changes.xml                                           | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecc2d35a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
index b8b9899..c36c4d8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
@@ -162,7 +162,7 @@ public abstract class AbstractDatabaseManager extends AbstractManager implements
      */
     public final synchronized void write(final LogEvent event) {
         if (this.bufferSize > 0) {
-            this.buffer.add(event.toImmutable());
+            this.buffer.add(event);
             if (this.buffer.size() >= this.bufferSize || event.isEndOfBatch()) {
                 this.flush();
             }

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecc2d35a/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 73d42ea..6dcb09e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -59,9 +59,6 @@
       <action issue="LOG4J2-2052" dev="rpopma" type="update">
         Disable thread name caching by default when running on Java 8u102 or later.
       </action>
-      <action issue="LOG4J2-2060" dev="rpopma" type="fix">
-        AbstractDatabaseManager should make a copy of LogEvents before holding references to them: AsyncLogger log events are mutable.
-      </action>
       <action issue="LOG4J2-2055" dev="rgoers" type="fix">
         If Log4j is used as the Tomcat logging implementation startup might fail if an application also uses Log4j.
       </action>


Re: [1/2] logging-log4j2 git commit: Revert "LOG4J2-2060 AbstractDatabaseManager should make a copy of LogEvents before holding references to them: AsyncLogger log events are mutable"

Posted by Gary Gregory <ga...@gmail.com>.
It's all good, easy to revert ;-)

On Oct 17, 2017 10:57, "Remko Popma" <re...@gmail.com> wrote:

> My bad.
>
> On Wed, Oct 18, 2017 at 12:22 AM, <gg...@apache.org> wrote:
>
> > Repository: logging-log4j2
> > Updated Branches:
> >   refs/heads/master ff5e664cd -> 247c91d01
> >
> >
> > Revert "LOG4J2-2060 AbstractDatabaseManager should make a copy of
> > LogEvents before holding references to them: AsyncLogger log events are
> > mutable"
> >
> > This reverts commit 334667c7acc2955e157572bfa3b8d0272a8f1495.
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/
> > commit/ecc2d35a
> > Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/
> ecc2d35a
> > Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/
> ecc2d35a
> >
> > Branch: refs/heads/master
> > Commit: ecc2d35a4d3a90327d8a490edbd00ec8bfaeaea3
> > Parents: ff5e664
> > Author: Gary Gregory <gg...@apache.org>
> > Authored: Tue Oct 17 08:43:25 2017 -0600
> > Committer: Gary Gregory <gg...@apache.org>
> > Committed: Tue Oct 17 08:43:25 2017 -0600
> >
> > ----------------------------------------------------------------------
> >  .../logging/log4j/core/appender/db/AbstractDatabaseManager.java   | 2
> +-
> >  src/changes/changes.xml                                           | 3
> ---
> >  2 files changed, 1 insertion(+), 4 deletions(-)
> > ----------------------------------------------------------------------
> >
> >
> > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> > ecc2d35a/log4j-core/src/main/java/org/apache/logging/log4j/
> > core/appender/db/AbstractDatabaseManager.java
> > ----------------------------------------------------------------------
> > diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/
> > appender/db/AbstractDatabaseManager.java b/log4j-core/src/main/java/
> > org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
> > index b8b9899..c36c4d8 100644
> > --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/
> appender/db/
> > AbstractDatabaseManager.java
> > +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/
> appender/db/
> > AbstractDatabaseManager.java
> > @@ -162,7 +162,7 @@ public abstract class AbstractDatabaseManager extends
> > AbstractManager implements
> >       */
> >      public final synchronized void write(final LogEvent event) {
> >          if (this.bufferSize > 0) {
> > -            this.buffer.add(event.toImmutable());
> > +            this.buffer.add(event);
> >              if (this.buffer.size() >= this.bufferSize ||
> > event.isEndOfBatch()) {
> >                  this.flush();
> >              }
> >
> > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> > ecc2d35a/src/changes/changes.xml
> > ----------------------------------------------------------------------
> > diff --git a/src/changes/changes.xml b/src/changes/changes.xml
> > index 73d42ea..6dcb09e 100644
> > --- a/src/changes/changes.xml
> > +++ b/src/changes/changes.xml
> > @@ -59,9 +59,6 @@
> >        <action issue="LOG4J2-2052" dev="rpopma" type="update">
> >          Disable thread name caching by default when running on Java
> 8u102
> > or later.
> >        </action>
> > -      <action issue="LOG4J2-2060" dev="rpopma" type="fix">
> > -        AbstractDatabaseManager should make a copy of LogEvents before
> > holding references to them: AsyncLogger log events are mutable.
> > -      </action>
> >        <action issue="LOG4J2-2055" dev="rgoers" type="fix">
> >          If Log4j is used as the Tomcat logging implementation startup
> > might fail if an application also uses Log4j.
> >        </action>
> >
> >
>

Re: [1/2] logging-log4j2 git commit: Revert "LOG4J2-2060 AbstractDatabaseManager should make a copy of LogEvents before holding references to them: AsyncLogger log events are mutable"

Posted by Remko Popma <re...@gmail.com>.
My bad.

On Wed, Oct 18, 2017 at 12:22 AM, <gg...@apache.org> wrote:

> Repository: logging-log4j2
> Updated Branches:
>   refs/heads/master ff5e664cd -> 247c91d01
>
>
> Revert "LOG4J2-2060 AbstractDatabaseManager should make a copy of
> LogEvents before holding references to them: AsyncLogger log events are
> mutable"
>
> This reverts commit 334667c7acc2955e157572bfa3b8d0272a8f1495.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
> Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/
> commit/ecc2d35a
> Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ecc2d35a
> Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ecc2d35a
>
> Branch: refs/heads/master
> Commit: ecc2d35a4d3a90327d8a490edbd00ec8bfaeaea3
> Parents: ff5e664
> Author: Gary Gregory <gg...@apache.org>
> Authored: Tue Oct 17 08:43:25 2017 -0600
> Committer: Gary Gregory <gg...@apache.org>
> Committed: Tue Oct 17 08:43:25 2017 -0600
>
> ----------------------------------------------------------------------
>  .../logging/log4j/core/appender/db/AbstractDatabaseManager.java   | 2 +-
>  src/changes/changes.xml                                           | 3 ---
>  2 files changed, 1 insertion(+), 4 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> ecc2d35a/log4j-core/src/main/java/org/apache/logging/log4j/
> core/appender/db/AbstractDatabaseManager.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/
> appender/db/AbstractDatabaseManager.java b/log4j-core/src/main/java/
> org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
> index b8b9899..c36c4d8 100644
> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/
> AbstractDatabaseManager.java
> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/
> AbstractDatabaseManager.java
> @@ -162,7 +162,7 @@ public abstract class AbstractDatabaseManager extends
> AbstractManager implements
>       */
>      public final synchronized void write(final LogEvent event) {
>          if (this.bufferSize > 0) {
> -            this.buffer.add(event.toImmutable());
> +            this.buffer.add(event);
>              if (this.buffer.size() >= this.bufferSize ||
> event.isEndOfBatch()) {
>                  this.flush();
>              }
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> ecc2d35a/src/changes/changes.xml
> ----------------------------------------------------------------------
> diff --git a/src/changes/changes.xml b/src/changes/changes.xml
> index 73d42ea..6dcb09e 100644
> --- a/src/changes/changes.xml
> +++ b/src/changes/changes.xml
> @@ -59,9 +59,6 @@
>        <action issue="LOG4J2-2052" dev="rpopma" type="update">
>          Disable thread name caching by default when running on Java 8u102
> or later.
>        </action>
> -      <action issue="LOG4J2-2060" dev="rpopma" type="fix">
> -        AbstractDatabaseManager should make a copy of LogEvents before
> holding references to them: AsyncLogger log events are mutable.
> -      </action>
>        <action issue="LOG4J2-2055" dev="rgoers" type="fix">
>          If Log4j is used as the Tomcat logging implementation startup
> might fail if an application also uses Log4j.
>        </action>
>
>

[2/2] logging-log4j2 git commit: [LOG4J2-2078] Update LMAX disruptor from 3.3.6 to 3.3.7. Note that in order to get a passing build with 'mvn clean install' I had to revert in the previous commit the changes for LOG4J2-2060 AbstractDatabaseManager should

Posted by gg...@apache.org.
[LOG4J2-2078] Update LMAX disruptor from 3.3.6 to 3.3.7. Note that in
order to get a passing build with 'mvn clean install' I had to revert in
the previous commit the changes for LOG4J2-2060 AbstractDatabaseManager
should make a copy of LogEvents before holding references to them:
AsyncLogger log events are mutable.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/247c91d0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/247c91d0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/247c91d0

Branch: refs/heads/master
Commit: 247c91d01cb4563cc4615eafd81fff5133b44b84
Parents: ecc2d35
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Oct 17 09:22:53 2017 -0600
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Oct 17 09:22:53 2017 -0600

----------------------------------------------------------------------
 pom.xml                 | 2 +-
 src/changes/changes.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/247c91d0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f27af6f..41b52c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,7 @@
     <jackson2Version>2.9.1</jackson2Version>
     <springVersion>3.2.18.RELEASE</springVersion>
     <flumeVersion>1.7.0</flumeVersion>
-    <disruptorVersion>3.3.6</disruptorVersion>
+    <disruptorVersion>3.3.7</disruptorVersion>
     <conversantDisruptorVersion>1.2.10</conversantDisruptorVersion> <!-- Version 1.2.11 requires Java 8 -->
     <compiler.plugin.version>3.7.0</compiler.plugin.version>
     <pmd.plugin.version>3.7</pmd.plugin.version>

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/247c91d0/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6dcb09e..4772a2e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -92,6 +92,9 @@
       <action issue="LOG4J2-2074" dev="ggregory" type="fix">
         The console appender should say why it cannot load JAnsi.
       </action>
+      <action issue="LOG4J2-2078" dev="ggregory" type="fix">
+        Update LMAX disruptor from 3.3.6 to 3.3.7.
+      </action>
     </release>
     <release version="2.9.1" date="2017-09-17" description="GA Release 2.9.1">
       <action issue="LOG4J2-1988" dev="rpopma" type="fix">