cvs commit: jakarta-slide/src/share/org/apache/slide/util/logger SimpleLogger.java

[re...@locus.apache.org]

remm        00/07/14 18:50:35

  Modified:    src/share/org/apache/slide/util/logger SimpleLogger.java
  Log:
  - Added date patterns and enhanced the output of the
    SimpleLogger
  
  Revision  Changes    Path
  1.2       +75 -5     jakarta-slide/src/share/org/apache/slide/util/logger/SimpleLogger.java
  
  Index: SimpleLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/util/logger/SimpleLogger.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SimpleLogger.java	2000/07/14 16:46:25	1.1
  +++ SimpleLogger.java	2000/07/15 01:50:34	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/util/logger/SimpleLogger.java,v 1.1 2000/07/14 16:46:25 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/07/14 16:46:25 $
  + * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/util/logger/SimpleLogger.java,v 1.2 2000/07/15 01:50:34 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2000/07/15 01:50:34 $
    *
    * ====================================================================
    *
  @@ -63,6 +63,10 @@
   
   package org.apache.slide.util.logger;
   
  +import java.util.Date;
  +import java.util.Locale;
  +import java.text.SimpleDateFormat;
  +
   /**
    * Simple logger implementation.
    * 
  @@ -80,6 +84,61 @@
       private int loggerLevel = 0;
       
       
  +    /**
  +     * Date / Time format.
  +     */
  +    private SimpleDateFormat dateFormat = null;
  +    
  +    
  +    /**
  +     * Text values for logging priorities.
  +     */
  +    private String[] loggingLevels = { "EMERGENCY", "CRITICAL", "ERROR",
  +                                       "", "WARNING", "", "INFO", "DEBUG" };
  +    
  +    
  +    // ------------------------------------------------------------- Properties
  +    
  +    
  +    /**
  +     * Logger level setter.
  +     * 
  +     * @param loggerLevel New logger level
  +     */
  +    public void setLoggerLevel(int loggerLevel) {
  +        this.loggerLevel = loggerLevel;
  +    }
  +    
  +    
  +    /**
  +     * Logger level getter.
  +     * 
  +     * @return int logger level
  +     */
  +    public int getLoggerLevel() {
  +        return loggerLevel;
  +    }
  +    
  +    
  +    /**
  +     * Date format setter.
  +     * 
  +     * @param pattern Format pattern
  +     */
  +    public void setDateFormat(String pattern) {
  +        dateFormat = new SimpleDateFormat(pattern);
  +    }
  +    
  +    
  +    /**
  +     * Use HTTP date format.
  +     */
  +    public void useHttpDateFormat() {
  +        dateFormat = 
  +            new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
  +    }
  +    
  +    
       // --------------------------------------------------------- Logger Methods
       
       
  @@ -91,8 +150,19 @@
        * @param level The level used for logging.
        */
       public void log(Object data, String channel, int level) {
  -        if (loggerLevel > level) {
  -            System.out.println(channel + " - " + level + " - " + data);
  +        if (loggerLevel >= level) {
  +            String levelValue = "";
  +            if ((level >= 0) && (level < loggingLevels.length))
  +                levelValue = loggingLevels[level];
  +            if (dateFormat == null) {
  +                System.out.println(System.currentTimeMillis() + " - " 
  +                                   + channel + " - " + levelValue + " - " 
  +                                   + data);
  +            } else {
  +                System.out.println(dateFormat.format(new Date()) + " - " 
  +                                   + channel + " - " + levelValue + " - " 
  +                                   + data);
  +            }
           }
       }