You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2003/05/17 16:30:03 UTC

cvs commit: jakarta-log4j/src/java/org/apache/log4j/rolling RollingPolicy.java RollingFileAppender.java SlidingWindowRollingPolicy.java SizeBasedTriggeringPolicy.java

ceki        2003/05/17 07:30:03

  Modified:    src/java/org/apache/log4j/rolling RollingPolicy.java
                        RollingFileAppender.java
                        SlidingWindowRollingPolicy.java
                        SizeBasedTriggeringPolicy.java
  Log:
  Simplified interfaces and code
  
  Revision  Changes    Path
  1.5       +8 -7      jakarta-log4j/src/java/org/apache/log4j/rolling/RollingPolicy.java
  
  Index: RollingPolicy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/rolling/RollingPolicy.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RollingPolicy.java	16 May 2003 11:36:19 -0000	1.4
  +++ RollingPolicy.java	17 May 2003 14:30:02 -0000	1.5
  @@ -49,17 +49,16 @@
   
   
   /**
  - * A <code>RollingPolicy</code> is responsible for copying a log
  - * file after the occurence of a rollover triggering event. The RollingPolicy
  - * is also responsible for providing the log file where logging output 
  - * will be directed.
  + * A <code>RollingPolicy</code> is responsible for copying a log  file after 
  + * the occurence of a rollover triggering event. The RollingPolicy is also 
  + * responsible for providing the log file where logging output will be 
  + * directed.
    *
    * @author Ceki G&uuml;lc&uuml;
    * @since 1.3
    * */
   package org.apache.log4j.rolling;
   
  -import java.io.File;
   
   import org.apache.log4j.spi.OptionHandler;
   
  @@ -67,9 +66,11 @@
   public interface RollingPolicy extends OptionHandler {
       
     /**
  -   * Copy the file passed as parameter to an appropriate location.
  +   * 
  +   * Rollover log files according to implementation policy.
  +   * .
      * */
  -  public void rollover(File oldLogFile);
  +  public void rollover();
   
     /**
      * Get the new name of the active log file.
  
  
  
  1.7       +1 -1      jakarta-log4j/src/java/org/apache/log4j/rolling/RollingFileAppender.java
  
  Index: RollingFileAppender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/rolling/RollingFileAppender.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- RollingFileAppender.java	16 May 2003 11:36:19 -0000	1.6
  +++ RollingFileAppender.java	17 May 2003 14:30:03 -0000	1.7
  @@ -118,7 +118,7 @@
       this.closeFile();
   
       activeFile = new File(fileName);
  -    rollingPolicy.rollover(activeFile);
  +    rollingPolicy.rollover();
   
       try {
         // This will also close the file. This is OK since multiple
  
  
  
  1.5       +1 -1      jakarta-log4j/src/java/org/apache/log4j/rolling/SlidingWindowRollingPolicy.java
  
  Index: SlidingWindowRollingPolicy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/rolling/SlidingWindowRollingPolicy.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SlidingWindowRollingPolicy.java	14 May 2003 18:20:28 -0000	1.4
  +++ SlidingWindowRollingPolicy.java	17 May 2003 14:30:03 -0000	1.5
  @@ -77,7 +77,7 @@
       activeFileName = null;
     }
   
  -  public void rollover(File f) {
  +  public void rollover() {
       // Inside this method it is guaranteed that the hereto active log fil is closed.
       // If maxIndex <= 0, then there is no file renaming to be done.
       if (maxIndex >= 0) {
  
  
  
  1.2       +1 -0      jakarta-log4j/src/java/org/apache/log4j/rolling/SizeBasedTriggeringPolicy.java
  
  Index: SizeBasedTriggeringPolicy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/rolling/SizeBasedTriggeringPolicy.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SizeBasedTriggeringPolicy.java	16 May 2003 11:36:20 -0000	1.1
  +++ SizeBasedTriggeringPolicy.java	17 May 2003 14:30:03 -0000	1.2
  @@ -62,6 +62,7 @@
     long maxFileSize = 10 * 1024 * 1024; // let 10 MB the default max size
   
     public boolean isTriggeringEvent(File file) {
  +    System.out.print("Size: "+ file.length());
       return (file.length() > maxFileSize);
     }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-dev-help@jakarta.apache.org