const char* logconf = getenv("SHIBSP_LOGGING");
if (!logconf || !*logconf) {
- if (isEnabled(SPConfig::OutOfProcess) && !isEnabled(SPConfig::InProcess))
+ if (isEnabled(SPConfig::Logging) && isEnabled(SPConfig::OutOfProcess) && !isEnabled(SPConfig::InProcess))
logconf = SHIBSP_OUTOFPROC_LOGGING;
- else if (isEnabled(SPConfig::InProcess) && !isEnabled(SPConfig::OutOfProcess))
+ else if (isEnabled(SPConfig::Logging) && isEnabled(SPConfig::InProcess) && !isEnabled(SPConfig::OutOfProcess))
logconf = SHIBSP_INPROC_LOGGING;
else
logconf = SHIBSP_LOGGING;
std::string lc(logconf);
XMLToolingConfig::getConfig().log_config(localpr.resolve(lc, PathResolver::XMLTOOLING_CFG_FILE, PACKAGE_NAME).c_str());
- Category& log=Category::getInstance(SHIBSP_LOGCAT".Config");
+ Category& log=Category::getInstance(SHIBSP_LOGCAT ".Config");
log.debug("%s library initialization started", PACKAGE_STRING);
#ifndef SHIBSP_LITE
return false;
}
#endif
- if (!catalog_path)
- catalog_path = getenv("SHIBSP_SCHEMAS");
- if (!catalog_path || !*catalog_path)
- catalog_path = SHIBSP_SCHEMAS;
- if (!XMLToolingConfig::getConfig().getValidatingParser().loadCatalogs(catalog_path)) {
- log.warn("failed to load schema catalogs into validating parser");
- }
PathResolver* pr = XMLToolingConfig::getConfig().getPathResolver();
pr->setDefaultPackageName(PACKAGE_NAME);
inst_prefix = SHIBSP_XMLDIR;
pr->setXMLDir(inst_prefix);
+ if (!catalog_path)
+ catalog_path = getenv("SHIBSP_SCHEMAS");
+ if (!catalog_path || !*catalog_path)
+ catalog_path = SHIBSP_SCHEMAS;
+ if (!XMLToolingConfig::getConfig().getValidatingParser().loadCatalogs(catalog_path)) {
+ log.warn("failed to load schema catalogs into validating parser");
+ }
+
XMLToolingConfig::getConfig().setTemplateEngine(new TemplateEngine());
XMLToolingConfig::getConfig().getTemplateEngine()->setTagPrefix("shibmlp");
void SPConfig::term()
{
- Category& log=Category::getInstance(SHIBSP_LOGCAT".Config");
+ Category& log=Category::getInstance(SHIBSP_LOGCAT ".Config");
log.info("%s library shutting down", PACKAGE_STRING);
setServiceProvider(nullptr);
catch (exception& ex) {
if (rethrow)
throw;
- Category::getInstance(SHIBSP_LOGCAT".Config").fatal("caught exception while loading configuration: %s", ex.what());
+ Category::getInstance(SHIBSP_LOGCAT ".Config").fatal("caught exception while loading configuration: %s", ex.what());
}
return false;
}
Lock initLock(m_lock);
if (m_initCount == INT_MAX) {
- Category::getInstance(SHIBSP_LOGCAT".Config").crit("library initialized too many times");
+ Category::getInstance(SHIBSP_LOGCAT ".Config").crit("library initialized too many times");
return false;
}
Lock initLock(m_lock);
if (m_initCount == 0) {
- Category::getInstance(SHIBSP_LOGCAT".Config").crit("term without corresponding init");
+ Category::getInstance(SHIBSP_LOGCAT ".Config").crit("term without corresponding init");
return;
}
else if (--m_initCount > 0) {