From 2bd957b34a0c31ab4fc4baa281689251b233b1fe Mon Sep 17 00:00:00 2001 From: cantor Date: Tue, 4 Mar 2008 01:50:45 +0000 Subject: [PATCH] Shift property set logging to its own category. git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2756 cb58f699-b61c-0410-a6fe-9272a202ed29 --- shibsp/handler/impl/AbstractHandler.cpp | 2 +- shibsp/impl/XMLRequestMapper.cpp | 4 ++-- shibsp/impl/XMLServiceProvider.cpp | 10 +++++----- shibsp/util/DOMPropertySet.cpp | 16 +++++++++------- shibsp/util/DOMPropertySet.h | 6 +++--- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/shibsp/handler/impl/AbstractHandler.cpp b/shibsp/handler/impl/AbstractHandler.cpp index d74b4dd..3f2e0da 100644 --- a/shibsp/handler/impl/AbstractHandler.cpp +++ b/shibsp/handler/impl/AbstractHandler.cpp @@ -106,7 +106,7 @@ void SHIBSP_API shibsp::registerHandlers() AbstractHandler::AbstractHandler( const DOMElement* e, Category& log, DOMNodeFilter* filter, const map* remapper ) : m_log(log), m_configNS(shibspconstants::SHIB2SPCONFIG_NS) { - load(e,log,filter,remapper); + load(e,NULL,filter,remapper); } #ifndef SHIBSP_LITE diff --git a/shibsp/impl/XMLRequestMapper.cpp b/shibsp/impl/XMLRequestMapper.cpp index 1d214ee..9c5f294 100644 --- a/shibsp/impl/XMLRequestMapper.cpp +++ b/shibsp/impl/XMLRequestMapper.cpp @@ -191,7 +191,7 @@ Override::Override(const DOMElement* e, Category& log, const Override* base) : m { try { // Load the property set. - load(e,log,this); + load(e,NULL,this); setParent(base); // Load any AccessControl provider. @@ -450,7 +450,7 @@ XMLRequestMapperImpl::XMLRequestMapperImpl(const DOMElement* e, Category& log) : #endif // Load the property set. - load(e,log,this); + load(e,NULL,this); // Load any AccessControl provider. loadACL(e,log); diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp index 132e2f2..fc507b7 100644 --- a/shibsp/impl/XMLServiceProvider.cpp +++ b/shibsp/impl/XMLServiceProvider.cpp @@ -463,7 +463,7 @@ XMLApplication::XMLApplication( try { // First load any property sets. - load(e,log,this); + load(e,NULL,this); if (base) setParent(base); @@ -859,7 +859,7 @@ XMLApplication::XMLApplication( child = XMLHelper::getFirstChildElement(e,RelyingParty); while (child) { auto_ptr rp(new DOMPropertySet()); - rp->load(child,log,this); + rp->load(child,NULL,this); rp->setParent(this); m_partyMap[child->getAttributeNS(NULL,saml2::Attribute::NAME_ATTRIB_NAME)]=rp.release(); child = XMLHelper::getNextSiblingElement(child,RelyingParty); @@ -1123,9 +1123,9 @@ short XMLConfigImpl::acceptNode(const DOMNode* node) const XMLString::equals(name,_ArtifactMap) || XMLString::equals(name,_Extensions) || XMLString::equals(name,Listener) || - XMLString::equals(name,Policy) || XMLString::equals(name,_RequestMapper) || XMLString::equals(name,_ReplayCache) || + XMLString::equals(name,SecurityPolicies) || XMLString::equals(name,_SessionCache) || XMLString::equals(name,Site) || XMLString::equals(name,_StorageService) || @@ -1202,7 +1202,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o } // First load any property sets. - load(e,log,this); + load(e,NULL,this); const DOMElement* child; string plugtype; @@ -1347,7 +1347,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o pair< PropertySet*,vector >& rules = m_policyMap[id.get()]; rules.first = NULL; auto_ptr settings(new DOMPropertySet()); - settings->load(child, log, &filter); + settings->load(child, NULL, &filter); rules.first = settings.release(); // Process Rule elements. diff --git a/shibsp/util/DOMPropertySet.cpp b/shibsp/util/DOMPropertySet.cpp index d7dc70f..f2cb41a 100644 --- a/shibsp/util/DOMPropertySet.cpp +++ b/shibsp/util/DOMPropertySet.cpp @@ -41,7 +41,7 @@ DOMPropertySet::~DOMPropertySet() void DOMPropertySet::load( const DOMElement* e, - Category& log, + Category* log, DOMNodeFilter* filter, const std::map* remapper ) @@ -52,6 +52,8 @@ void DOMPropertySet::load( if (!e) return; m_root=e; + if (!log) + log = &Category::getInstance(SHIBSP_LOGCAT".PropertySet"); // Process each attribute as a property. DOMNamedNodeMap* attrs=m_root->getAttributes(); @@ -68,7 +70,7 @@ void DOMPropertySet::load( if (remapper) { remap=remapper->find(realname); if (remap!=remapper->end()) { - log.warn("remapping property (%s) to (%s)",realname,remap->second.c_str()); + log->warn("remapping property (%s) to (%s)",realname,remap->second.c_str()); realname=remap->second.c_str(); } } @@ -77,11 +79,11 @@ void DOMPropertySet::load( m_map[string("{") + remap->second.c_str() + '}' + realname]=pair(val,a->getNodeValue()); else m_map[string("{") + ns.get() + '}' + realname]=pair(val,a->getNodeValue()); - log.debug("added property {%s}%s (%s)",ns.get(),realname,val); + log->debug("added property {%s}%s (%s)",ns.get(),realname,val); } else { m_map[realname]=pair(val,a->getNodeValue()); - log.debug("added property %s (%s)",realname,val); + log->debug("added property %s (%s)",realname,val); } } } @@ -100,7 +102,7 @@ void DOMPropertySet::load( if (remapper) { remap=remapper->find(realname); if (remap!=remapper->end()) { - log.warn("remapping property set (%s) to (%s)",realname,remap->second.c_str()); + log->warn("remapping property set (%s) to (%s)",realname,remap->second.c_str()); realname=remap->second.c_str(); } } @@ -114,12 +116,12 @@ void DOMPropertySet::load( else key=realname; if (m_nested.find(key)!=m_nested.end()) - log.warn("load() skipping duplicate property set: %s",key.c_str()); + log->warn("load() skipping duplicate property set: %s",key.c_str()); else { DOMPropertySet* set=new DOMPropertySet(); set->load(e,log,filter,remapper); m_nested[key]=set; - log.debug("added nested property set: %s",key.c_str()); + log->debug("added nested property set: %s",key.c_str()); } e=static_cast(walker->nextSibling()); } diff --git a/shibsp/util/DOMPropertySet.h b/shibsp/util/DOMPropertySet.h index ca9cfbb..45d67ac 100644 --- a/shibsp/util/DOMPropertySet.h +++ b/shibsp/util/DOMPropertySet.h @@ -62,14 +62,14 @@ namespace shibsp { * Loads the property set from a DOM element. * * @param e root element of property set - * @param log log object for tracing + * @param log optional log object for tracing * @param filter optional filter controls what child elements to include as nested PropertySets * @param remapper optional map of property rename rules for legacy property support */ void load( const xercesc::DOMElement* e, - xmltooling::logging::Category& log, - xercesc::DOMNodeFilter* filter, + xmltooling::logging::Category* log=NULL, + xercesc::DOMNodeFilter* filter=NULL, const std::map* remapper=NULL ); -- 2.1.4