Look for JUL logging.properties on the classpath

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6d57ce01
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6d57ce01
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6d57ce01

Branch: refs/heads/master
Commit: 6d57ce01e91aa11b71e676071492cc5839b7b2d9
Parents: 970d4e1
Author: Andy Seaborne <[email protected]>
Authored: Sun Dec 31 10:47:03 2017 +0000
Committer: Andy Seaborne <[email protected]>
Committed: Sun Dec 31 10:47:03 2017 +0000

----------------------------------------------------------------------
 .../org/apache/jena/atlas/logging/LogCtl.java   | 25 ++++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/6d57ce01/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java 
b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
index 3059aed..46dc105 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
@@ -282,10 +282,27 @@ public class LogCtl {
     
     public static void setJavaLogging() {
         Path p = Paths.get(JUL_LOGGING) ;
-        if ( Files.exists(p) )
+        if ( Files.exists(p) ) {
             setJavaLogging(JUL_LOGGING) ;
-        else
-            setJavaLoggingDft();
+            return ;
+        }
+        if ( setJavaLoggingClasspath(JUL_LOGGING) )
+            return ;
+        setJavaLoggingDft();
+    }
+
+    private static boolean setJavaLoggingClasspath(String resourceName) {
+        // Not "LogCtl.class.getResourceAsStream(resourceName)" which monkeys 
around with the resourceName.
+        InputStream in = 
LogCtl.class.getClassLoader().getResourceAsStream(resourceName);
+        if ( in != null ) {
+            try {
+                
java.util.logging.LogManager.getLogManager().readConfiguration(in) ;
+                return true; 
+            } catch (Exception ex) {
+                throw new AtlasException(ex) ;
+            }
+        }
+        return false;
     }
 
     public static void setJavaLogging(String file) {
@@ -307,6 +324,4 @@ public class LogCtl {
             throw new AtlasException(ex) ;
         }
     }
-
 }
-

Reply via email to