Resolve path of default logging config.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2776 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp
index 772c404..65d5b74 100644 (file)
--- a/shibsp/SPConfig.cpp
+++ b/shibsp/SPConfig.cpp
@@ -104,19 +104,21 @@ bool SPConfig::init(const char* catalog_path, const char* inst_prefix)
 #ifdef _DEBUG
     NDC ndc("init");
 #endif
 #ifdef _DEBUG
     NDC ndc("init");
 #endif

-    Category& log=Category::getInstance(SHIBSP_LOGCAT".Config");
-    log.debug("%s library initialization started", PACKAGE_STRING);
-
-    const char* loglevel=getenv("SHIBSP_LOGGING");
-    if (!loglevel)
-        loglevel = SHIBSP_LOGGING;
-    XMLToolingConfig::getConfig().log_config(loglevel);
-

     if (!inst_prefix)
         inst_prefix = getenv("SHIBSP_PREFIX");
     if (!inst_prefix)
         inst_prefix = SHIBSP_PREFIX;
     
     if (!inst_prefix)
         inst_prefix = getenv("SHIBSP_PREFIX");
     if (!inst_prefix)
         inst_prefix = SHIBSP_PREFIX;
     

+    const char* loglevel=getenv("SHIBSP_LOGGING");
+    if (!loglevel)
+        loglevel = SHIBSP_LOGGING;
+    std::string ll(loglevel);
+    PathResolver localpr;
+    XMLToolingConfig::getConfig().log_config(localpr.resolve(ll, PathResolver::XMLTOOLING_CFG_FILE, PACKAGE_NAME, inst_prefix).c_str());
+
+    Category& log=Category::getInstance(SHIBSP_LOGCAT".Config");
+    log.debug("%s library initialization started", PACKAGE_STRING);
+

     if (!catalog_path)
         catalog_path = getenv("SHIBSP_SCHEMAS");
     if (!catalog_path)
     if (!catalog_path)
         catalog_path = getenv("SHIBSP_SCHEMAS");
     if (!catalog_path)