cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/log Log4JLogSystem.java

[geirm]

geirm       01/03/19 04:11:11

  Modified:    src/java/org/apache/velocity/runtime/log Log4JLogSystem.java
  Log:
  minor formatting :)
  
  Revision  Changes    Path
  1.3       +22 -5     
jakarta-velocity/src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java
  
  Index: Log4JLogSystem.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Log4JLogSystem.java       2001/03/19 08:11:31     1.2
  +++ Log4JLogSystem.java       2001/03/19 12:11:10     1.3
  @@ -67,7 +67,7 @@
    * Implementation of a Log4J logger.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
  - * @version $Id: Log4JLogSystem.java,v 1.2 2001/03/19 08:11:31 jon Exp $
  + * @version $Id: Log4JLogSystem.java,v 1.3 2001/03/19 12:11:10 geirm Exp $
    */
   public class Log4JLogSystem implements LogSystem
   {
  @@ -119,16 +119,22 @@
       {
           logger = Category.getInstance("");
           logger.setAdditivity(false);
  -        // Priority is set for DEBUG becouse this implementation checks 
  -        // log level.
  +
  +        /*
  +         * Priority is set for DEBUG becouse this implementation checks 
  +         * log level.
  +         */
           logger.setPriority(Priority.DEBUG);
   
           String pattern = Runtime.getString( Runtime.LOGSYSTEM_LOG4J_PATTERN );
  +        
           if (pattern == null || pattern.length() == 0)
           {
               pattern = "%d - %m%n";
           }
  +        
           layout = new PatternLayout(pattern);
  +        
           configureFile();
           configureRemote();
           configureSyslog();
  @@ -145,9 +151,12 @@
               Runtime.getInt(Runtime.LOGSYSTEM_LOG4J_FILE_BACKUPS, 1);
           int fileSize = 
               Runtime.getInt(Runtime.LOGSYSTEM_LOG4J_FILE_SIZE, 100000);
  +        
           Appender appender = new RollingFileAppender(layout,logfile,true);
  +        
           ((RollingFileAppender)appender).setMaxBackupIndex(backupFiles);
  -        //finding file size
  +        
  +        /* finding file size */
           if (fileSize > -1)
           {
               ((RollingFileAppender)appender).setMaxFileSize(fileSize);
  @@ -165,12 +174,15 @@
               Runtime.getString(Runtime.LOGSYSTEM_LOG4J_REMOTE_HOST);
           int remotePort = 
               Runtime.getInt(Runtime.LOGSYSTEM_LOG4J_REMOTE_PORT, 1099);
  +        
           if (remoteHost == null || remoteHost.trim().equals("") || 
               remotePort <= 0)
           {
               return;
           }
  +        
           Appender appender=new SocketAppender(remoteHost,remotePort);
  +        
           logger.addAppender(appender);
       }
   
  @@ -184,6 +196,7 @@
               Runtime.getString(Runtime.LOGSYSTEM_LOG4J_SYSLOGD_HOST);
           String syslogFacility = 
               Runtime.getString(Runtime.LOGSYSTEM_LOG4J_SYSLOGD_FACILITY);
  +        
           if (syslogHost == null || syslogHost.trim().equals("") || 
               syslogFacility == null )
           {
  @@ -191,14 +204,16 @@
           }
   
           Appender appender = new SyslogAppender();
  +        
           ((SyslogAppender)appender).setLayout(layout);
           ((SyslogAppender)appender).setSyslogHost(syslogHost);
           ((SyslogAppender)appender).setFacility(syslogFacility);
  +        
           logger.addAppender(appender);
       }
   
       /**
  -     * Configures the logging to syslogd
  +     * Configures the logging to email
        */
       private void configureEmail()
           throws Exception
  @@ -224,11 +239,13 @@
           }
   
           SMTPAppender appender = new SMTPAppender();
  +        
           appender.setOption(SMTPAppender.SMTP_HOST_OPTION, smtpHost);
           appender.setOption(SMTPAppender.FROM_OPTION, emailFrom);
           appender.setOption(SMTPAppender.TO_OPTION, emailTo);
           appender.setOption(SMTPAppender.SUBJECT_OPTION, emailSubject);
           appender.setOption(SMTPAppender.BUFFER_SIZE_OPTION, bufferSize);
  +        
           appender.setLayout(layout);
           appender.activateOptions();
           logger.addAppender(appender);