diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-10 20:51:38 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-10 20:51:38 +0100 |
commit | 09d297a383b60cfdba6b6388cc54c9c8fa603e75 (patch) | |
tree | 38f2d131bcbb352717c6b7e65cb5fd397071239c /src/main/java/io/trygvis/esper/testing/Config.java | |
parent | 7838a06e5521db39aee8b3b87785fcb5e32cd7ad (diff) | |
download | esper-testing-09d297a383b60cfdba6b6388cc54c9c8fa603e75.tar.gz esper-testing-09d297a383b60cfdba6b6388cc54c9c8fa603e75.tar.bz2 esper-testing-09d297a383b60cfdba6b6388cc54c9c8fa603e75.tar.xz esper-testing-09d297a383b60cfdba6b6388cc54c9c8fa603e75.zip |
o Fixing another bug in the unbreakable poller, stored one build too many in some progress objects too.
o Got the logback.xml + system properties combination to finally work.
Diffstat (limited to 'src/main/java/io/trygvis/esper/testing/Config.java')
-rwxr-xr-x | src/main/java/io/trygvis/esper/testing/Config.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/Config.java b/src/main/java/io/trygvis/esper/testing/Config.java index 7da14fa..68c4f1a 100755 --- a/src/main/java/io/trygvis/esper/testing/Config.java +++ b/src/main/java/io/trygvis/esper/testing/Config.java @@ -70,9 +70,9 @@ public class Config { } public static Config loadFromDisk(String appName) throws IOException { - initSystemProperties(); + initSystemProperties(appName); - initLogging(appName); + initLogging(); Properties properties = new Properties(); try (FileInputStream inputStream = new FileInputStream("etc/config.properties")) { @@ -88,15 +88,15 @@ public class Config { trimToNull(properties.getProperty("database.password"))); } - private static void initSystemProperties() { + private static void initSystemProperties(String appName) { // Java 7 is more strict on checking matching host names or something similar. // http://docs.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html#Customization System.setProperty("jsse.enableSNIExtension", "false"); - } - private static void initLogging(String appName) { - System.setProperty("logging.app", appName); + System.setProperty("loggingApp", appName); + } + private static void initLogging() { File logs = new File("logs"); if(!logs.isDirectory()) { |