You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by al...@locus.apache.org on 2000/07/11 04:33:47 UTC

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core BaseInterceptor.java

alex        00/07/10 19:33:47

  Modified:    src/share/org/apache/tomcat/core BaseInterceptor.java
  Log:
  Clean up logging, remove printStackTrace and System.out.println
  
  BaseInterceptor now provides useable log() methods, so all subclasses
  can call log() directly
  
  Revision  Changes    Path
  1.15      +19 -9     jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
  
  Index: BaseInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- BaseInterceptor.java	2000/06/23 02:16:20	1.14
  +++ BaseInterceptor.java	2000/07/11 02:33:46	1.15
  @@ -62,6 +62,8 @@
   
   import org.apache.tomcat.core.*;
   import org.apache.tomcat.util.*;
  +import org.apache.tomcat.logging.Logger.Helper;
  +import org.apache.tomcat.logging.Logger;
   import java.io.*;
   import java.net.*;
   import java.util.*;
  @@ -73,6 +75,9 @@
       protected String methods[]=new String[0];
       protected int debug=0;
       protected String name=null;
  +
  +    //  loghelper will use name of actual impl subclass
  +    protected Logger.Helper loghelper = new Logger.Helper("tc_log", this);
       
       public BaseInterceptor() {
       }
  @@ -83,18 +88,23 @@
   
       public void setContextManager( ContextManager cm ) {
   	this.cm=cm;
  +	loghelper.setLogger(cm.getLogger());
       }
   
       protected void log( String s ) {
  -	if( name == null ) {
  -	    String cname=this.getClass().getName();
  -	    name=cname.substring( cname.lastIndexOf(".") +1);
  -	    name=name + ": ";
  -	}
  -	if( cm!= null )
  -	    cm.log( name + s );
  -	else 
  -	    System.out.println(name + s ); 
  +	loghelper.log(s);
  +    }
  +    
  +    protected void log( String s, Throwable t ) {
  +	loghelper.log(s, t);
  +    }
  +    
  +    protected void log( String s, int level ) {
  +	loghelper.log(s, level);
  +    }
  +    
  +    protected void log( String s, Throwable t, int level ) {
  +	loghelper.log(s, t, level);
       }
       
       // -------------------- Request notifications --------------------