Return-Path: <alex@locus.apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 75646 invoked by uid 500); 11 Jul 2000 02:44:42 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Received: (qmail 75635 invoked by uid 1148); 11 Jul 2000 02:44:41 -0000
Date: 11 Jul 2000 02:44:41 -0000
Message-ID: <20000711024441.75634.qmail@locus.apache.org>
From: alex@locus.apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
 ResponseImpl.java

alex        00/07/10 19:44:41

  Modified:    src/share/org/apache/tomcat/core ResponseImpl.java
  Log:
  Clean up logging, remove printStackTrace and System.out.println
  
  Logs to request's context's log if available, else default tc_log
  
  Revision  Changes    Path
  1.34      +23 -10    jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java
  
  Index: ResponseImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- ResponseImpl.java	2000/06/30 20:21:25	1.33
  +++ ResponseImpl.java	2000/07/11 02:44:40	1.34
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v 1.33 2000/06/30 20:21:25 costin Exp $
  - * $Revision: 1.33 $
  - * $Date: 2000/06/30 20:21:25 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v 1.34 2000/07/11 02:44:40 alex Exp $
  + * $Revision: 1.34 $
  + * $Date: 2000/07/11 02:44:40 $
    *
    * ====================================================================
    *
  @@ -71,6 +71,8 @@
   import javax.servlet.http.*;
   import org.apache.tomcat.util.*;
   import org.apache.tomcat.facade.*;
  +import org.apache.tomcat.logging.*;
  +
   /**
    *
    * @author James Duncan Davidson [duncan@eng.sun.com]
  @@ -247,8 +249,7 @@
   	    try {
   		return  new OutputStreamWriter(outs, encoding);
   	    } catch (java.io.UnsupportedEncodingException ex) {
  -		// XXX log it
  -		System.out.println("Unsuported encoding: " + encoding );
  +		log("Unsuported encoding: " + encoding, Logger.ERROR );
   
   		return new OutputStreamWriter(outs);
   	    }
  @@ -316,7 +317,8 @@
   		setContentLength( cL );
   		return true;
   	    } catch( NumberFormatException ex ) {
  -		// We shouldn't set the header 
  +		// We shouldn't set the header
  +		log("Bogus Content-Length: " + value, Logger.WARNING);
   	    }
   	}
   	if( name.equalsIgnoreCase( "Content-Language" ) ) {
  @@ -358,9 +360,6 @@
   
       public void setBufferCommitted( boolean v ) {
   	this.commited=v;
  -	// 	System.out.println("Buffer commited " );
  -	// 	/*DEBUG*/ try {throw new Exception(); }
  -	//catch(Exception ex) {ex.printStackTrace();}
       }
       
       public void reset() throws IllegalStateException {
  @@ -419,7 +418,7 @@
        *  interceptors to fix headers.
        */
       public void notifyEndHeaders() throws IOException {
  -	//	System.out.println("End headers " + request.getProtocol());
  +	//	log("End headers " + request.getProtocol());
   	if(request.getProtocol()==null) // HTTP/0.9 
   	    return;
   
  @@ -561,4 +560,18 @@
   	return sm.getString("sc."+ status);
       }
   
  +    // write log messages to correct log
  +    
  +    Logger.Helper loghelper = new Logger.Helper("tc_log", this);
  +    
  +    protected void log(String s) {
  +	log(s, Logger.INFORMATION);
  +    }
  +    protected void log(String s, int level) {
  +	if (request != null && request.getContext() != null) {
  +	    loghelper.setLogger(request.getContext().getLoggerHelper().getLogger());
  +	}
  +	loghelper.log(s, level);
  +    }		       
  +    
   }