Now looks in system configuration directory if configuration files cannot be found locally

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@48 09dcff7a-b715-0410-9601-b79a96267cd0

2 files changed, 16 insertions, 5 deletions

diff --git a/orkaudio/ConfigManager.cpp b/orkaudio/ConfigManager.cpp
index 9157539..6caa462 100644
--- a/orkaudio/ConfigManager.cpp
+++ b/orkaudio/ConfigManager.cpp
@@ -23,7 +23,7 @@
 #include "LogManager.h"
 
 #define CONFIG_FILE_NAME "config.xml"
-#define ETC_CONFIG_FILE_NAME "/etc/oreka/config.xml"
+#define ETC_CONFIG_FILE_NAME "/etc/orkaudio/config.xml"
 
 
 void ConfigManager::Initialize()
@@ -43,7 +43,7 @@ void ConfigManager::Initialize()
 		}
 		else
 		{
-			// config.xml could not be found in the current directory, try to find it in /etc/oreka
+			// config.xml could not be found in the current directory, try to find it in system configuration directory
 			cfgFilename = ETC_CONFIG_FILE_NAME;
 		}
 
diff --git a/orkaudio/LogManager.cpp b/orkaudio/LogManager.cpp
index ba955d1..5773748 100644
--- a/orkaudio/LogManager.cpp
+++ b/orkaudio/LogManager.cpp
@@ -22,11 +22,22 @@ void OrkLogManager::Initialize()
 {
 	BasicConfigurator::configure();
 
-	// If this one fails, the above default configuration stays valid
-	PropertyConfigurator::configure("/etc/oreka/logging.properties");
+	char* logCfgFilename = ""; 
+	FILE* file = ACE_OS::fopen("logging.properties", "r");
+	if(file)
+	{
+		// logging.properties exists in the current directory
+		logCfgFilename = "logging.properties";
+		fclose(file);
+	}
+	else
+	{
+		// logging.properties could not be found in the current directory, try to find it in system configuration directory
+		logCfgFilename = "/etc/orkaudio/logging.properties";
+	}
 
 	// If this one fails, the above default configuration stays valid
-	PropertyConfigurator::configure("logging.properties");
+	PropertyConfigurator::configure(logCfgFilename);
 
 	rootLog  = Logger::getLogger("root");
 	topLog = Logger::getLogger("top");