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

[amyroh]

amyroh      2004/09/17 14:58:25

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardServer.java
  Log:
  More logging changes - remove System.err to use commons logging.
  
  Revision  Changes    Path
  1.37      +8 -11     
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- StandardServer.java       29 Aug 2004 16:46:09 -0000      1.36
  +++ StandardServer.java       17 Sep 2004 21:58:25 -0000      1.37
  @@ -463,9 +463,8 @@
                   new ServerSocket(port, 1,
                                    InetAddress.getByName("127.0.0.1"));
           } catch (IOException e) {
  -            System.err.println("StandardServer.await: create[" + port
  -                               + "]: " + e);
  -            e.printStackTrace();
  +            log.error("StandardServer.await: create[" + port
  +                               + "]: ", e);
               System.exit(1);
           }
   
  @@ -480,12 +479,11 @@
                   socket.setSoTimeout(10 * 1000);  // Ten seconds
                   stream = socket.getInputStream();
               } catch (AccessControlException ace) {
  -                System.err.println("StandardServer.accept security exception: "
  -                                   + ace.getMessage());
  +                log.warn("StandardServer.accept security exception: "
  +                                   + ace.getMessage(), ace);
                   continue;
               } catch (IOException e) {
  -                System.err.println("StandardServer.await: accept: " + e);
  -                e.printStackTrace();
  +                log.error("StandardServer.await: accept: ", e);
                   System.exit(1);
               }
   
  @@ -502,8 +500,7 @@
                   try {
                       ch = stream.read();
                   } catch (IOException e) {
  -                    System.err.println("StandardServer.await: read: " + e);
  -                    e.printStackTrace();
  +                    log.warn("StandardServer.await: read: ", e);
                       ch = -1;
                   }
                   if (ch < 32)  // Control character or EOF terminates loop
  @@ -524,7 +521,7 @@
               if (match) {
                   break;
               } else
  -                System.err.println("StandardServer.await: Invalid command '" +
  +                log.warn("StandardServer.await: Invalid command '" +
                                      command.toString() + "' received");
   
           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]