1 files changed, 12 insertions, 5 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/logging/LoggingConfiguration.java b/src/de/lmu/ifi/dbs/elki/logging/LoggingConfiguration.java
index 2d191f7c..e6a61bef 100644
--- a/src/de/lmu/ifi/dbs/elki/logging/LoggingConfiguration.java
+++ b/src/de/lmu/ifi/dbs/elki/logging/LoggingConfiguration.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging;
  This file is part of ELKI:
  Environment for Developing KDD-Applications Supported by Index-Structures
 
- Copyright (C) 2011
+ Copyright (C) 2012
  Ludwig-Maximilians-Universität München
  Lehr- und Forschungseinheit für Datenbanksysteme
  ELKI Development Team
@@ -48,7 +48,7 @@ public final class LoggingConfiguration {
   /**
    * Configuration file name
    */
-  private static final String CLIConffile = "logging-cli.properties";
+  private static final String LOGGING_PROPERTIES_FILE = "logging.properties";
 
   /**
    * Top level ELKI package (for setting 'verbose')
@@ -63,7 +63,7 @@ public final class LoggingConfiguration {
   /**
    * Static instance of the configuration
    */
-  protected static LoggingConfiguration config = new LoggingConfiguration(confbase, CLIConffile);
+  protected static LoggingConfiguration config = new LoggingConfiguration(confbase, LOGGING_PROPERTIES_FILE);
 
   /**
    * Configure Java Logging API: {@link java.util.logging.LogManager}
@@ -95,8 +95,15 @@ public final class LoggingConfiguration {
     if(pkg == null) {
       pkg = "";
     }
-    // Load logging configuration from resources.
-    String cfgfile = pkg.replace('.', File.separatorChar) + File.separatorChar + name;
+    // Load logging configuration from current directory
+    String cfgfile = name;
+    if(new File(name).exists()) {
+      cfgfile = name;
+    }
+    else {
+      // Fall back to full path / resources.
+      cfgfile = pkg.replace('.', File.separatorChar) + File.separatorChar + name;
+    }
     try {
       InputStream cfgdata = FileUtil.openSystemFile(cfgfile);
       logManager.readConfiguration(cfgdata);