Split init logging.

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

diff --git a/isapi_shib/isapi_shib.cpp b/isapi_shib/isapi_shib.cpp
index f51b0f5..838859a 100644 (file)
--- a/isapi_shib/isapi_shib.cpp
+++ b/isapi_shib/isapi_shib.cpp
@@ -65,6 +65,7 @@
 #include <fstream>
 #include <sstream>
 #include <stdexcept>
+#include <process.h>
 
 #include <httpfilt.h>
 #include <httpext.h>
@@ -192,10 +193,16 @@ extern "C" BOOL WINAPI GetFilterVersion(PHTTP_FILTER_VERSION pVer)
             ShibTargetConfig::LocalExtensions |
             ShibTargetConfig::Logging
             );
-        if (!g_Config->init(schemadir) || !g_Config->load(config)) {
+        if (!g_Config->init(schemadir)) {
             g_Config=NULL;
             LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL,
-                    "Filter startup failed during initialization, check shire log for help.");
+                    "Filter startup failed during library initialization, check native log for help.");
+            return FALSE;
+        }
+        else if (!g_Config->load(config)) {
+            g_Config=NULL;
+            LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL,
+                    "Filter startup failed to load configuration, check native log for help.");
             return FALSE;
         }