Merge pull request #770 from pzygielo/downgrade-log-warnings

Author: pzygielo

mq/main/logger/src/main/java/com/sun/messaging/jmq/util/log/SysLogHandler.java

@@ -73,16 +73,8 @@ public SysLogHandler() {
 
             configure(facilityStr, logpidStr, logconsoleStr, identityStr, outputStr);
 
-        } catch (UnsatisfiedLinkError e) {
-            java.util.logging.Logger logger = java.util.logging.Logger.getLogger(Logger.LOGGERNAME);
-            logger.log(Level.INFO,
-                    SharedResources.getResources().getKString(SharedResources.W_LOGCHANNEL_DISABLED, this.getClass().getName(), e.getMessage()));
-            open = false;
-        } catch (NoClassDefFoundError e) {
-            java.util.logging.Logger logger = java.util.logging.Logger.getLogger(Logger.LOGGERNAME);
-            logger.log(Level.INFO,
-                    SharedResources.getResources().getKString(SharedResources.W_LOGCHANNEL_DISABLED, this.getClass().getName(), e.getMessage()));
-            open = false;
+        } catch (UnsatisfiedLinkError|NoClassDefFoundError e) {
+            handleSharedLibraryError(e);
         }
     }
 
@@ -102,19 +94,22 @@ public SysLogHandler(Properties props) {
 
             configure(facilityStr, logpidStr, logconsoleStr, identityStr, outputStr);
 
-        } catch (UnsatisfiedLinkError e) {
-            java.util.logging.Logger logger = java.util.logging.Logger.getLogger(Logger.LOGGERNAME);
-            logger.log(Level.INFO,
-                    SharedResources.getResources().getKString(SharedResources.W_LOGCHANNEL_DISABLED, this.getClass().getName(), e.getMessage()));
-            open = false;
-        } catch (NoClassDefFoundError e) {
-            java.util.logging.Logger logger = java.util.logging.Logger.getLogger(Logger.LOGGERNAME);
-            logger.log(Level.INFO,
-                    SharedResources.getResources().getKString(SharedResources.W_LOGCHANNEL_DISABLED, this.getClass().getName(), e.getMessage()));
-            open = false;
+        } catch (UnsatisfiedLinkError|NoClassDefFoundError e) {
+            handleSharedLibraryError(e);
         }
     }
 
+    private void handleSharedLibraryError(Error e) {
+        java.util.logging.Logger logger = java.util.logging.Logger.getLogger(Logger.LOGGERNAME);
+        logSharedLibraryError(logger, e.getMessage());
+        open = false;
+    }
+
+    static void logSharedLibraryError(java.util.logging.Logger logger, String errorMessage) {
+        logger.log(Level.INFO,
+                SharedResources.getResources().getKString(SharedResources.W_LOGCHANNEL_DISABLED, SysLogHandler.class.getName(), errorMessage));
+    }
+
     public static void setFacility(int f) {
         facility = f;
     }

mq/main/logger/src/test/java/com/sun/messaging/jmq/util/log/SysLogHandlerTest.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.messaging.jmq.util.log;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import org.mockito.Mockito;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SysLogHandlerTest {
+    @Nested
+    class Issue289 {
+        @Test
+        void testLevelForLibraryErrorLog() {
+            Logger logger = Mockito.mock(Logger.class);
+
+            SysLogHandler.logSharedLibraryError(logger, "Library not found");
+
+            Mockito.verify(logger).log(eq(Level.INFO), anyString());
+        }
+    }
+
+    @Test
+    void testLibraryErrorLogMessage() {
+        Logger logger = Mockito.mock(Logger.class);
+        String expectedLog = "[S2004]: Log output channel com.sun.messaging.jmq.util.log.SysLogHandler is disabled: Library not found (2)";
+
+        SysLogHandler.logSharedLibraryError(logger, "Library not found (2)");
+
+        Mockito.verify(logger).log(any(Level.class), eq(expectedLog));
+    }
+}