[MRM-138] clean up some more logging

git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@431569 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java
index 19cef4eddc9092f6ce11908d240382cb309e8807..1583bb73fd9bfae45432ff306d97539c1f2cb8db 100644 (file)
--- a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java
+++ b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java
@@ -450,7 +450,7 @@ public class DefaultProxyRequestHandler
         }
         catch ( NoSuchAlgorithmException e )
         {
-            getLogger().info( "An error occurred while preparing checksum observers", e );
+            getLogger().error( "An error occurred while preparing checksum observers: " + e.getMessage() );
         }
         return checksums;
     }
@@ -539,15 +539,14 @@ public class DefaultProxyRequestHandler
             }
             catch ( TransferFailedException e )
             {
-                getLogger().warn( "An error occurred during the download of " + checksumPath + ": " + e.getMessage(),
-                                  e );
+                getLogger().warn( "An error occurred during the download of " + checksumPath + ": " + e.getMessage() );
                 // do nothing try the next checksum
 
                 allNotFound = false;
             }
             catch ( ResourceDoesNotExistException e )
             {
-                getLogger().debug( "The checksum did not exist: " + checksumPath, e );
+                getLogger().debug( "The checksum did not exist: " + checksumPath + "; " + e.getMessage() );
                 // do nothing try the next checksum
                 // remove it if it is present locally in case there is an old incorrect one
                 if ( checksumFile.exists() )
@@ -557,22 +556,21 @@ public class DefaultProxyRequestHandler
             }
             catch ( AuthorizationException e )
             {
-                getLogger().warn( "An error occurred during the download of " + checksumPath + ": " + e.getMessage(),
-                                  e );
+                getLogger().warn( "An error occurred during the download of " + checksumPath + ": " + e.getMessage() );
                 // do nothing try the next checksum
 
                 allNotFound = false;
             }
             catch ( IOException e )
             {
-                getLogger().warn( "An error occurred while reading the temporary checksum file.", e );
+                getLogger().warn( "An error occurred while reading the temporary checksum file: " + e.getMessage() );
                 // do nothing try the next checksum
 
                 allNotFound = false;
             }
             catch ( DigesterException e )
             {
-                getLogger().warn( "The checksum was invalid: " + checksumPath + ": " + e.getMessage(), e );
+                getLogger().warn( "The checksum was invalid: " + checksumPath + ": " + e.getMessage() );
                 // do nothing try the next checksum
 
                 allNotFound = false;

diff --git a/maven-repository-proxy/src/test/resources/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.xml b/maven-repository-proxy/src/test/resources/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.xml
index d7fa2be2fef63b7b4ee54195d2e44bfeb91373ee..a3a47dbbea1c1148976374180513409b65d9b6b2 100644 (file)
--- a/maven-repository-proxy/src/test/resources/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.xml
+++ b/maven-repository-proxy/src/test/resources/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.xml
@@ -21,5 +21,14 @@
       <role-hint>test</role-hint>
       <implementation>org.apache.maven.repository.proxy.WagonDelegate</implementation>
     </component>
+    <component>
+      <role>org.codehaus.plexus.logging.LoggerManager</role>
+      <implementation>org.codehaus.plexus.logging.console.ConsoleLoggerManager</implementation>
+      <lifecycle-handler>basic</lifecycle-handler>
+
+      <configuration>
+        <threshold>ERROR</threshold>
+      </configuration>
+    </component>
   </components>
 </component-set>