From 549a31d40afdc9267d86009f40812c1dee4ee1cf Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 13 Nov 2014 11:25:02 +0000
Subject: [PATCH] OPENDJ-1620 Unexpected log severity for some actions/commands

---
 opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java |   28 ++++++++++------------------
 1 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index 7eb7414..733ee85 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -1874,7 +1874,7 @@
           }
           if (!isCanceled)
           {
-            logger.error(NOTE_JEB_IMPORT_LDIF_DN_CLOSE, indexMgr.getDNCount());
+            logger.info(NOTE_JEB_IMPORT_LDIF_DN_CLOSE, indexMgr.getDNCount());
           }
         }
         else
@@ -2960,27 +2960,23 @@
     {
       totalEntries = suffix.getID2Entry().getRecordCount();
 
-      LocalizableMessage message = null;
       switch (rebuildConfig.getRebuildMode())
       {
       case ALL:
-        message = NOTE_JEB_REBUILD_ALL_START.get(totalEntries);
+        logger.info(NOTE_JEB_REBUILD_ALL_START, totalEntries);
         break;
       case DEGRADED:
-        message = NOTE_JEB_REBUILD_DEGRADED_START.get(totalEntries);
+        logger.info(NOTE_JEB_REBUILD_DEGRADED_START, totalEntries);
         break;
       default:
-        if (!rebuildConfig.isClearDegradedState())
+        if (!rebuildConfig.isClearDegradedState()
+            && logger.isInfoEnabled())
         {
           String indexes = Utils.joinAsString(", ", rebuildConfig.getRebuildList());
-          message = NOTE_JEB_REBUILD_START.get(indexes, totalEntries);
+          logger.info(NOTE_JEB_REBUILD_START, indexes, totalEntries);
         }
         break;
       }
-      if ( message != null )
-      {
-        logger.info(message);
-      }
     }
 
     /**
@@ -3716,16 +3712,14 @@
         long freeMemory = runtime.freeMemory() / MB;
         EnvironmentStats envStats =
             rootContainer.getEnvironmentStats(new StatsConfig());
-        long nCacheMiss =
-            envStats.getNCacheMiss() - prevEnvStats.getNCacheMiss();
+        long nCacheMiss = envStats.getNCacheMiss() - prevEnvStats.getNCacheMiss();
 
         float cacheMissRate = 0;
         if (deltaCount > 0)
         {
           cacheMissRate = nCacheMiss / (float) deltaCount;
         }
-        logger.info(NOTE_JEB_REBUILD_CACHE_AND_MEMORY_REPORT, freeMemory,
-                cacheMissRate);
+        logger.info(NOTE_JEB_REBUILD_CACHE_AND_MEMORY_REPORT, freeMemory, cacheMissRate);
         prevEnvStats = envStats;
       }
       catch (DatabaseException e)
@@ -3826,8 +3820,7 @@
         {
           cacheMissRate = nCacheMiss / (float) deltaCount;
         }
-        logger.info(NOTE_JEB_IMPORT_CACHE_AND_MEMORY_REPORT, freeMemory,
-                cacheMissRate);
+        logger.info(NOTE_JEB_IMPORT_CACHE_AND_MEMORY_REPORT, freeMemory, cacheMissRate);
         long evictPasses = environmentStats.getNEvictPasses();
         long evictNodes = environmentStats.getNNodesExplicitlyEvicted();
         long evictBinsStrip = environmentStats.getNBINsStripped();
@@ -3941,8 +3934,7 @@
         {
           cacheMissRate = nCacheMiss / (float) deltaCount;
         }
-        logger.info(NOTE_JEB_IMPORT_CACHE_AND_MEMORY_REPORT, freeMemory,
-                cacheMissRate);
+        logger.info(NOTE_JEB_IMPORT_CACHE_AND_MEMORY_REPORT, freeMemory, cacheMissRate);
         long evictPasses = environmentStats.getNEvictPasses();
         long evictNodes = environmentStats.getNNodesExplicitlyEvicted();
         long evictBinsStrip = environmentStats.getNBINsStripped();

--
Gitblit v1.10.0