Skip to content
Snippets Groups Projects
Commit eee992f0 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

moved logging.props; always in src root now

parent 7f8ceb08
No related branches found
No related tags found
1 merge request!242To gradle build 240
...@@ -6,7 +6,6 @@ import static java.util.logging.Level.SEVERE; ...@@ -6,7 +6,6 @@ import static java.util.logging.Level.SEVERE;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.logging.Formatter; import java.util.logging.Formatter;
...@@ -28,14 +27,7 @@ public class Logging { ...@@ -28,14 +27,7 @@ public class Logging {
*/ */
public static void init() { public static void init() {
try { try {
/*
* When running from a jar, logging.properties will have been moved to the
* root of the source directory, otherwise it can be found in lib.
*/
InputStream is = Logging.class.getResourceAsStream("/logging.properties"); InputStream is = Logging.class.getResourceAsStream("/logging.properties");
if (is == null) {
is = new FileInputStream("lib/logging.properties");
}
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} catch (IOException ioe) { } catch (IOException ioe) {
ioe.printStackTrace(); ioe.printStackTrace();
......
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment