Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 5858 invoked from network); 2 May 2008 17:02:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 May 2008 17:02:05 -0000 Received: (qmail 41893 invoked by uid 500); 2 May 2008 17:02:07 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 41846 invoked by uid 500); 2 May 2008 17:02:07 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 41835 invoked by uid 99); 2 May 2008 17:02:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2008 10:02:07 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 02 May 2008 17:01:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5C4172388A16; Fri, 2 May 2008 10:01:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r652823 - in /incubator/sling/trunk/osgi/log/src/main/java/org: apache/sling/osgi/log/slf4j/SlingLogFileWriter.java apache/sling/osgi/log/slf4j/SlingLoggerFactory.java slf4j/impl/StaticLoggerBinder.java Date: Fri, 02 May 2008 17:01:42 -0000 To: sling-commits@incubator.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080502170142.5C4172388A16@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Fri May 2 10:01:41 2008 New Revision: 652823 URL: http://svn.apache.org/viewvc?rev=652823&view=rev Log: Clean up code. Modified: incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/slf4j/SlingLogFileWriter.java incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/slf4j/SlingLoggerFactory.java incubator/sling/trunk/osgi/log/src/main/java/org/slf4j/impl/StaticLoggerBinder.java Modified: incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/slf4j/SlingLogFileWriter.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/slf4j/SlingLogFileWriter.java?rev=652823&r1=652822&r2=652823&view=diff ============================================================================== --- incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/slf4j/SlingLogFileWriter.java (original) +++ incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/slf4j/SlingLogFileWriter.java Fri May 2 10:01:41 2008 @@ -21,7 +21,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; @@ -30,8 +29,7 @@ private static final long FACTOR_KB = 1024; private static final long FACTOR_MB = 1024 * FACTOR_KB; private static final long FACTOR_GB = 1024 * FACTOR_MB; - private static final long DEFAULT_MAX_SIZE = 10 * FACTOR_GB; - + private final File file; private final String path; @@ -43,15 +41,15 @@ public SlingLogFileWriter(String logFileName, int fileNum, String fileSize) throws IOException { this(logFileName, fileNum, convertMaxSizeSpec(fileSize)); } - + public SlingLogFileWriter(String logFileName, int fileNum, long fileSize) throws IOException { - + // make sure the file is absolute and derive the path from there File file = new File(logFileName); if (!file.isAbsolute()) { file = file.getAbsoluteFile(); } - + this.path = file.getAbsolutePath(); this.file = file; @@ -67,7 +65,7 @@ checkRotate(); } - + private Writer createFile() throws IOException { // ensure parent path of the file to create file.getParentFile().mkdirs(); @@ -84,7 +82,7 @@ getDelegatee().close(); if (maxNum >= 0) { - + // remove oldest file File dstFile = new File(path + "." + maxNum); if (dstFile.exists()) { @@ -102,14 +100,14 @@ // rename youngest file file.renameTo(dstFile); - + } else { - + // just remove the old file if we don't keep backups file.delete(); - + } - + // create new file setDelegatee(createFile()); } Modified: incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/slf4j/SlingLoggerFactory.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/slf4j/SlingLoggerFactory.java?rev=652823&r1=652822&r2=652823&view=diff ============================================================================== --- incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/slf4j/SlingLoggerFactory.java (original) +++ incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/slf4j/SlingLoggerFactory.java Fri May 2 10:01:41 2008 @@ -19,10 +19,8 @@ package org.apache.sling.osgi.log.slf4j; import java.io.IOException; -import java.io.PrintWriter; import java.text.MessageFormat; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -75,7 +73,7 @@ t.printStackTrace(System.err); } } - + // private constructor to prevent instantiation. This is a singleton class private SlingLoggerFactory() { } @@ -86,7 +84,7 @@ * Returns a logger for the given name. If such a logger already exists the * same logger is returned. Otherwise a new instance is created and * configured with the current logging level, output and message format. - * + * * @param name The name of the logger to return */ public Logger getLogger(String name) { @@ -105,7 +103,7 @@ /** * Configures this factory and all existing loggers with the new log level, * output and message format. - * + * * @param logLevel The log level to be set. If this is not a valid * {@link SlingLoggerLevel} value, the default INFO * is assumed. @@ -149,7 +147,7 @@ } } } - + public List getLoggerList() { synchronized (loggers) { return new ArrayList(loggers.values()); @@ -167,5 +165,5 @@ logger.configure(level, output, messageFormat); return logger; } - + } Modified: incubator/sling/trunk/osgi/log/src/main/java/org/slf4j/impl/StaticLoggerBinder.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/log/src/main/java/org/slf4j/impl/StaticLoggerBinder.java?rev=652823&r1=652822&r2=652823&view=diff ============================================================================== --- incubator/sling/trunk/osgi/log/src/main/java/org/slf4j/impl/StaticLoggerBinder.java (original) +++ incubator/sling/trunk/osgi/log/src/main/java/org/slf4j/impl/StaticLoggerBinder.java Fri May 2 10:01:41 2008 @@ -19,10 +19,7 @@ package org.slf4j.impl; import org.apache.sling.osgi.log.slf4j.SlingLoggerFactory; -import org.slf4j.LoggerFactory; -import org.slf4j.MarkerFactory; import org.slf4j.ILoggerFactory; -import org.slf4j.IMarkerFactory; import org.slf4j.spi.LoggerFactoryBinder; /**