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 2014/05/20 19:08:59 UTC

svn commit: r1596318 - in /logging/log4j/log4j2/trunk/log4j-core/src: main/java/org/apache/logging/log4j/core/appender/ main/java/org/apache/logging/log4j/core/async/ main/java/org/apache/logging/log4j/core/config/ main/java/org/apache/logging/log4j/co...

Author: ggregory
Date: Tue May 20 17:08:58 2014
New Revision: 1596318

URL: http://svn.apache.org/r1596318
Log:
Rename and adjust the various {start|stop}Filter() methods to {start|stop}() to play as life cycles. This means that AbstractAppender no longer needs its own start/stop and instead can rely its superclass to start and stop its filters.

Modified:
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java?rev=1596318&r1=1596317&r2=1596318&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java Tue May 20 17:08:58 2014
@@ -156,24 +156,6 @@ public abstract class AbstractAppender e
         this.handler = handler;
     }
 
-    /**
-     * Start the Appender.
-     */
-    @Override
-    public void start() {
-        startFilter();
-        this.setStarted();
-    }
-
-    /**
-     * Stop the Appender.
-     */
-    @Override
-    public void stop() {
-        this.setStopped();
-        stopFilter();
-    }
-
     @Override
     public String toString() {
         return name;

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java?rev=1596318&r1=1596317&r2=1596318&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java Tue May 20 17:08:58 2014
@@ -119,19 +119,21 @@ public class AsyncLoggerConfig extends L
     }
 
     @Override
-    public void startFilter() {
+    public void start() {
+        this.setStarting();
         if (helper == null) {
             helper = new AsyncLoggerConfigHelper(this);
         } else {
             AsyncLoggerConfigHelper.claim(); // LOG4J2-336
         }
-        super.startFilter();
+        super.start();
     }
 
     @Override
-    public void stopFilter() {
+    public void stop() {
+        this.setStopping();
         AsyncLoggerConfigHelper.release();
-        super.stopFilter();
+        super.stop();
     }
 
     /**

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java?rev=1596318&r1=1596317&r2=1596318&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java Tue May 20 17:08:58 2014
@@ -136,6 +136,7 @@ public abstract class AbstractConfigurat
      */
     @Override
     public void start() {
+        this.setStarting();
         pluginManager.collectPlugins();
         final PluginManager levelPlugins = new PluginManager("Level");
         levelPlugins.collectPlugins();
@@ -155,13 +156,13 @@ public abstract class AbstractConfigurat
         setupAdvertisement();
         doConfigure();
         for (final LoggerConfig logger : loggers.values()) {
-            logger.startFilter();
+            logger.start();
         }
         for (final Appender appender : appenders.values()) {
             appender.start();
         }
-        root.startFilter(); // LOG4J2-336
-        startFilter();
+        root.start(); // LOG4J2-336
+        super.start();
     }
 
     /**
@@ -169,6 +170,7 @@ public abstract class AbstractConfigurat
      */
     @Override
     public void stop() {
+        this.setStopping();
         LOGGER.trace("AbstractConfiguration stopping...");
         
         // LOG4J2-392 first stop AsyncLogger Disruptor thread
@@ -194,12 +196,12 @@ public abstract class AbstractConfigurat
                 // have been stopped! Stopping the last AsyncLoggerConfig will
                 // shut down the disruptor and wait for all enqueued events to be processed.
                 // Only *after this* the appenders can be cleared or events will be lost.
-                logger.stopFilter();
+                logger.stop();
                 asyncLoggerConfigCount++;
             }
         }
         if (root instanceof AsyncLoggerConfig) {
-            root.stopFilter();
+            root.stop();
             asyncLoggerConfigCount++;
         }
         LOGGER.trace("AbstractConfiguration stopped {} AsyncLoggerConfigs.", asyncLoggerConfigCount);
@@ -230,14 +232,14 @@ public abstract class AbstractConfigurat
         for (final LoggerConfig logger : loggers.values()) {
             // AsyncLoggerConfig objects may be stopped multiple times, that's okay...
             logger.clearAppenders();
-            logger.stopFilter();
+            logger.stop();
             loggerCount++;
         }
         LOGGER.trace("AbstractConfiguration stopped {} Loggers.", loggerCount);
 
         // If root is an AsyncLoggerConfig it may already be stopped. Stopping it twice is okay.
-        root.stopFilter();
-        stopFilter();
+        root.stop();
+        super.stop();
         if (advertiser != null && advertisement != null) {
             advertiser.unadvertise(advertisement);
         }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java?rev=1596318&r1=1596317&r2=1596318&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java Tue May 20 17:08:58 2014
@@ -48,7 +48,7 @@ public class AppenderControl extends Abs
         this.appender = appender;
         this.level = level;
         this.intLevel = level == null ? Level.ALL.intLevel() : level.intLevel();
-        startFilter();
+        start();
     }
 
     /**

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java?rev=1596318&r1=1596317&r2=1596318&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java Tue May 20 17:08:58 2014
@@ -102,19 +102,25 @@ public abstract class AbstractFilterable
     /**
      * Make the Filter available for use.
      */
-    public void startFilter() {
-       if (filter != null) {
-           filter.start();
-       }
+    @Override
+    public void start() {
+        this.setStarting();
+        if (filter != null) {
+            filter.start();
+        }
+        this.setStarted();
     }
 
     /**
      * Cleanup the Filter.
      */
-    public void stopFilter() {
+    @Override
+    public void stop() {
+        this.setStopping();
        if (filter != null) {
            filter.stop();
        }
+       this.setStopped();
     }
 
     /**

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java?rev=1596318&r1=1596317&r2=1596318&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java Tue May 20 17:08:58 2014
@@ -100,7 +100,7 @@ public class PatternParserTest {
             formatter.format(event, buf);
         }
         final String str = buf.toString();
-        final String expected = "INFO  [PatternParserTest        :95  ] - Hello, world" + Constants.LINE_SEPARATOR;
+        final String expected = "INFO  [PatternParserTest        :93  ] - Hello, world" + Constants.LINE_SEPARATOR;
         assertTrue("Expected to end with: " + expected + ". Actual: " + str, str.endsWith(expected));
     }