[PAXLOGGING-224] aSupport for custom levels of LogService

ops4j · Mar 31, 2017 · 7c601e6 · 7c601e6
1 parent 113c0e4
commit 7c601e6
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 33 deletions.
diff --git a/...ing-log4j2/src/main/java/org/ops4j/pax/logging/log4j2/internal/PaxLoggingServiceImpl.java b/...ing-log4j2/src/main/java/org/ops4j/pax/logging/log4j2/internal/PaxLoggingServiceImpl.java
@@ -336,22 +336,29 @@ private void log( Bundle bundle, int level, String message, Throwable exception,
         }
 
         PaxLogger logger = getLogger( bundle, category, fqcn );
-        switch( level )
+        if( level < LOG_ERROR )
         {
-        case LOG_ERROR:
-            logger.error( message, exception );
-            break;
-        case LOG_WARNING:
-            logger.warn( message, exception );
-            break;
-        case LOG_INFO:
-            logger.inform( message, exception );
-            break;
-        case LOG_DEBUG:
-            logger.debug( message, exception );
-            break;
-        default:
-            logger.warn( "Undefined Level: " + level + " : " + message, exception );
+            logger.fatal( message, exception );
+        }
+        else
+        {
+            switch (level)
+            {
+            case LOG_ERROR:
+                logger.error( message, exception );
+                break;
+            case LOG_WARNING:
+                logger.warn( message, exception );
+                break;
+            case LOG_INFO:
+                logger.inform( message, exception );
+                break;
+            case LOG_DEBUG:
+                logger.debug( message, exception );
+                break;
+            default:
+                logger.trace( message, exception );
+            }
         }
     }
 

diff --git a/...g-logback/src/main/java/org/ops4j/pax/logging/logback/internal/PaxLoggingServiceImpl.java b/...g-logback/src/main/java/org/ops4j/pax/logging/logback/internal/PaxLoggingServiceImpl.java
@@ -202,10 +202,17 @@ private void logImpl( @Nullable Bundle bundle, int level, String message,
                 category = "[bundle@" + bundle.getBundleId() + ']';
             }
         }
-        try{
+        try
+        {
             PaxLogger logger = getLogger( bundle, category, fqcn );
-            switch( level )
+            if( level < LOG_ERROR )
+            {
+                logger.fatal( message, exception );
+            }
+            else
             {
+                switch (level)
+                {
                 case LOG_ERROR:
                     logger.error( message, exception );
                     break;
@@ -219,7 +226,8 @@ private void logImpl( @Nullable Bundle bundle, int level, String message,
                     logger.debug( message, exception );
                     break;
                 default:
-                    logger.warn( "Undefined Level: " + level + " : " + message, exception );
+                    logger.trace( message, exception );
+                }
             }
         } catch (RuntimeException e) {
             m_logbackContext.getStatusManager().add(new WarnStatus("Runtime logging failure", m_logbackContext, e));

diff --git a/...g-service/src/main/java/org/ops4j/pax/logging/service/internal/PaxLoggingServiceImpl.java b/...g-service/src/main/java/org/ops4j/pax/logging/service/internal/PaxLoggingServiceImpl.java
@@ -155,22 +155,29 @@ private void log( Bundle bundle, ServiceReference sr, int level, String message,
         }
 
         PaxLogger logger = getLogger( bundle, category, "" );
-        switch( level )
+        if( level < LOG_ERROR )
         {
-        case LOG_ERROR:
-            logger.error( message, exception );
-            break;
-        case LOG_WARNING:
-            logger.warn( message, exception );
-            break;
-        case LOG_INFO:
-            logger.inform( message, exception );
-            break;
-        case LOG_DEBUG:
-            logger.debug( message, exception );
-            break;
-        default:
-            logger.warn( "Undefined Level: " + level + " : " + message, exception );
+            logger.fatal( message, exception );
+        }
+        else
+        {
+            switch (level)
+            {
+            case LOG_ERROR:
+                logger.error( message, exception );
+                break;
+            case LOG_WARNING:
+                logger.warn( message, exception );
+                break;
+            case LOG_INFO:
+                logger.inform( message, exception );
+                break;
+            case LOG_DEBUG:
+                logger.debug( message, exception );
+                break;
+            default:
+                logger.trace( message, exception );
+            }
         }
     }