From a9eb1e1f7684e77cd861958b5c828de3930aeec7 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 5 Jun 2009 13:04:27 +0000
Subject: [PATCH] Simplify logging.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@782005 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/catalina/core/AprLifecycleListener.java | 49 ++++++----------------
 1 file changed, 12 insertions(+), 37 deletions(-)

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java
index 2624d450a..93220cfe1 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -87,11 +87,7 @@ public class AprLifecycleListener
                 try {
                     initializeSSL();
                 } catch (Throwable t) {
-                    if (!log.isDebugEnabled()) {
-                        log.info(sm.getString("aprListener.sslInit"));
-                    } else {
-                        log.debug(sm.getString("aprListener.sslInit"), t);
-                    }
+                    log.info(sm.getString("aprListener.sslInit"));
                 }
             }
         } else if (Lifecycle.AFTER_STOP_EVENT.equals(event.getType())) {
@@ -101,11 +97,7 @@ public class AprLifecycleListener
             try {
                 terminateAPR();
             } catch (Throwable t) {
-                if (!log.isDebugEnabled()) {
-                    log.info(sm.getString("aprListener.aprDestroy"));
-                } else {
-                    log.debug(sm.getString("aprListener.aprDestroy"), t);
-                }
+                log.info(sm.getString("aprListener.aprDestroy"));
             }
         }
 
@@ -142,13 +134,8 @@ public class AprLifecycleListener
             minor = clazz.getField("TCN_MINOR_VERSION").getInt(null);
             patch = clazz.getField("TCN_PATCH_VERSION").getInt(null);
         } catch (Throwable t) {
-            if (!log.isDebugEnabled()) {
-                log.info(sm.getString("aprListener.aprInit",
-                        System.getProperty("java.library.path")));
-            } else {
-                log.debug(sm.getString("aprListener.aprInit",
-                        System.getProperty("java.library.path")), t);
-            }
+            log.info(sm.getString("aprListener.aprInit",
+                    System.getProperty("java.library.path")));
             return false;
         }
         if ((major != TCN_REQUIRED_MAJOR)  ||
@@ -169,28 +156,16 @@ public class AprLifecycleListener
             return false;
         }
         if (patch <  TCN_RECOMMENDED_PV) {
-            if (!log.isDebugEnabled()) {
-                log.info(sm.getString("aprListener.tcnVersion", major + "."
-                        + minor + "." + patch,
-                        TCN_REQUIRED_MAJOR + "." +
-                        TCN_REQUIRED_MINOR + "." +
-                        TCN_RECOMMENDED_PV));
-            } else {
-                log.debug(sm.getString("aprListener.tcnVersion", major + "."
-                        + minor + "." + patch,
-                        TCN_REQUIRED_MAJOR + "." +
-                        TCN_REQUIRED_MINOR + "." +
-                        TCN_RECOMMENDED_PV));
-            }
+            log.info(sm.getString("aprListener.tcnVersion", major + "."
+                    + minor + "." + patch,
+                    TCN_REQUIRED_MAJOR + "." +
+                    TCN_REQUIRED_MINOR + "." +
+                    TCN_RECOMMENDED_PV));
         }
-        if (!log.isDebugEnabled()) {
-           log.info(sm.getString("aprListener.tcnValid", major + "."
+
+        log.info(sm.getString("aprListener.tcnValid", major + "."
                     + minor + "." + patch));
-        }
-        else {
-           log.debug(sm.getString("aprListener.tcnValid", major + "."
-                     + minor + "." + patch));
-        }
+
         // Log APR flags
         log.info(sm.getString("aprListener.flags",
                 Boolean.valueOf(Library.APR_HAVE_IPV6),
-- 
2.11.0