From ecd010e6bc6c55ed4c4f65b05d8bf92b396f48c5 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Mon, 4 Jul 2005 04:53:06 +0000 Subject: [PATCH] Log adjustments. --- shib-mysql-ccache/shib-mysql-ccache.cpp | 2 +- shib-target/shib-ccache.cpp | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/shib-mysql-ccache/shib-mysql-ccache.cpp b/shib-mysql-ccache/shib-mysql-ccache.cpp index 3948c1d..510cab9 100644 --- a/shib-mysql-ccache/shib-mysql-ccache.cpp +++ b/shib-mysql-ccache/shib-mysql-ccache.cpp @@ -756,7 +756,7 @@ void ShibMySQLCCache::cleanup() mysql_free_result(rows); } - log->debug("cleanup thread exiting..."); + log->info("cleanup thread exiting..."); mutex->unlock(); delete mutex; diff --git a/shib-target/shib-ccache.cpp b/shib-target/shib-ccache.cpp index 98b89fa..2c1e6c1 100644 --- a/shib-target/shib-ccache.cpp +++ b/shib-target/shib-ccache.cpp @@ -230,7 +230,7 @@ IPlugIn* MemoryCacheFactory(const DOMElement* e) InternalCCache::InternalCCache(const DOMElement* e) : m_root(e), m_AATimeout(30), m_AAConnectTimeout(15), m_defaultLifetime(1800), m_retryInterval(300), m_strictValidity(true), m_propagateErrors(false), lock(RWLock::create()), - log (&Category::getInstance("shibtarget.InternalCCache")) + log (&Category::getInstance(SHIBT_LOGCAT".SessionCache")) { const XMLCh* tag=m_root->getAttributeNS(NULL,AATimeout); if (tag && *tag) { @@ -390,12 +390,14 @@ void InternalCCache::remove(const char* key) void InternalCCache::cleanup() { - Mutex* mutex = Mutex::create(); - saml::NDC ndc("InternalCCache::cleanup()"); +#ifdef _DEBUG + saml::NDC ndc("cleanup()"); +#endif int rerun_timer = 0; int timeout_life = 0; - + Mutex* mutex = Mutex::create(); + // Load our configuration details... const XMLCh* tag=m_root->getAttributeNS(NULL,cleanupInterval); if (tag && *tag) @@ -413,7 +415,7 @@ void InternalCCache::cleanup() mutex->lock(); - log->debug("Cleanup thread started... Run every %d secs; timeout after %d secs", + log->info("Cleanup thread started... Run every %d secs; timeout after %d secs", rerun_timer, timeout_life); while (shutdown == false) { @@ -422,7 +424,7 @@ void InternalCCache::cleanup() if (shutdown == true) break; - log->info("Cleanup thread running..."); + log->debug("Cleanup thread running..."); // Ok, let's run through the cleanup process and clean out // really old sessions. This is a two-pass process. The @@ -461,7 +463,7 @@ void InternalCCache::cleanup() } } - log->debug("Cleanup thread finished."); + log->info("Cleanup thread finished."); mutex->unlock(); delete mutex; -- 2.1.4