Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F0A4A7576 for ; Sun, 2 Oct 2011 22:01:03 +0000 (UTC) Received: (qmail 84506 invoked by uid 500); 2 Oct 2011 22:01:03 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 84484 invoked by uid 500); 2 Oct 2011 22:01:03 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 84476 invoked by uid 99); 2 Oct 2011 22:01:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Oct 2011 22:01:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Oct 2011 22:01:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D1C1923889E3; Sun, 2 Oct 2011 22:00:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1178261 - in /logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src: main/java/org/apache/logging/log4j/core/ main/java/org/apache/logging/log4j/core/appender/rolling/ main/java/org/apache/logging/log4j/core/layout/ test/ja... Date: Sun, 02 Oct 2011 22:00:41 -0000 To: commits@logging.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111002220041.D1C1923889E3@eris.apache.org> Author: rgoers Date: Sun Oct 2 22:00:41 2011 New Revision: 1178261 URL: http://svn.apache.org/viewvc?rev=1178261&view=rev Log: Add OnStartupTriggeringPolicy Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java?rev=1178261&r1=1178260&r2=1178261&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java Sun Oct 2 22:00:41 2011 @@ -36,8 +36,6 @@ public class LoggerContext implements or private static StatusLogger logger = StatusLogger.getLogger(); - private static final long JVM_START_TIME = System.currentTimeMillis(); - private final ConcurrentMap loggers = new ConcurrentHashMap(); /** @@ -107,14 +105,6 @@ public class LoggerContext implements or } /** - * The time the LoggerContext class was loaded as a long. - * @return The time the LoggerContext was loaded. - */ - public static long getStartTime() { - return JVM_START_TIME; - } - - /** * Set the external context. * @param context The external context. */ Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java?rev=1178261&view=auto ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java (added) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java Sun Oct 2 22:00:41 2011 @@ -0,0 +1,70 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ +package org.apache.logging.log4j.core.appender.rolling; + +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.config.plugins.Plugin; +import org.apache.logging.log4j.core.config.plugins.PluginFactory; + +import java.lang.management.ManagementFactory; + +/** + * Trigger a rollover on every restart. The target file's timestamp is compared with the JVM start time + * and if it is older isTriggeringEvent will return true. After isTriggeringEvent has been called it will + * always return false. + */ + +@Plugin(name = "OnStartupTriggeringPolicy", type = "Core", printObject = true) +public class OnStartupTriggeringPolicy implements TriggeringPolicy { + + private boolean evaluated = false; + + private RollingFileManager manager; + + private static long jvmStartTime = ManagementFactory.getRuntimeMXBean().getStartTime(); + + /** + * Provide the RollingFileManager to the policy. + * @param manager The RollingFileManager. + */ + public void initialize(RollingFileManager manager) { + this.manager = manager; + } + + /** + * Determine if a rollover should be triggered. + * @param event A reference to the current event. + * @return true if the target file's timestamp is older than the JVM start time. + */ + public boolean isTriggeringEvent(LogEvent event) { + if (evaluated) { + return false; + } + evaluated = true; + return manager.getFileTime() < jvmStartTime; + } + + @Override + public String toString() { + return "OnStartupTriggeringPolicy"; + } + + @PluginFactory + public static OnStartupTriggeringPolicy createPolicy() { + return new OnStartupTriggeringPolicy(); + } +} Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java?rev=1178261&r1=1178260&r2=1178261&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java Sun Oct 2 22:00:41 2011 @@ -30,6 +30,7 @@ import java.io.LineNumberReader; import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; +import java.lang.management.ManagementFactory; import java.nio.charset.Charset; import java.util.ArrayList; @@ -44,20 +45,22 @@ public class HTMLLayout extends Abstract protected static final int BUF_SIZE = 256; - private static final String TRACE_PREFIX = "
    "; - // Print no location info by default protected final boolean locationInfo; + protected final String title; + + protected final String contentType; + + private static final String TRACE_PREFIX = "
    "; + private static final String LINE_SEP = System.getProperty("line.separator"); private static final String DEFAULT_TITLE = "Log4J Log Messages"; private static final String DEFAULT_CONTENT_TYPE = "text/html"; - protected final String title; - - protected final String contentType; + private final long jvmStartTime = ManagementFactory.getRuntimeMXBean().getStartTime(); public HTMLLayout(boolean locationInfo, String title, String contentType, Charset charset) { super(charset); @@ -72,7 +75,7 @@ public class HTMLLayout extends Abstract sbuf.append(LINE_SEP).append("").append(LINE_SEP); sbuf.append(""); - sbuf.append(event.getMillis() - LoggerContext.getStartTime()); + sbuf.append(event.getMillis() - jvmStartTime); sbuf.append("").append(LINE_SEP); String escapedThread = Transform.escapeTags(event.getThreadName()); Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java?rev=1178261&view=auto ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java (added) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java Sun Oct 2 22:00:41 2011 @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ +package org.apache.logging.log4j.core.appender.rolling; + +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.impl.Log4jLogEvent; +import org.apache.logging.log4j.message.SimpleMessage; +import org.junit.Test; + +import java.io.ByteArrayOutputStream; + +import static org.junit.Assert.assertTrue; + +/** + * + */ +public class OnStartupTriggeringPolicyTest { + + @Test + public void testPolicy() { + MyRollingManager manager = new MyRollingManager(); + manager.setFileTime(System.currentTimeMillis() - 36000000); + OnStartupTriggeringPolicy policy = OnStartupTriggeringPolicy.createPolicy(); + policy.initialize(manager); + LogEvent event = new Log4jLogEvent(null, null, null, Level.ERROR, new SimpleMessage("Test"), null); + assertTrue("Expected trigger to succeed", policy.isTriggeringEvent(event)); + assertTrue("Expected trigger not to fire", !policy.isTriggeringEvent(event)); + policy = OnStartupTriggeringPolicy.createPolicy(); + policy.initialize(manager); + manager.setFileTime(System.currentTimeMillis()); + assertTrue("Expected trigger not to fire", !policy.isTriggeringEvent(event)); + + } + + private class MyRollingManager extends RollingFileManager { + + private long timestamp; + + public MyRollingManager() { + super("testfile", "target/rolling1/test1-%i.log.gz", new ByteArrayOutputStream(), + false, 0, System.currentTimeMillis()); + } + + public void setFileTime(long timestamp) { + this.timestamp = timestamp; + } + + public long getFileTime() { + return timestamp; + } + } +}