From 533d3c5df2a5a4fce56b7681fe439839534d4963 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 6 Mar 2006 22:47:05 +0000
Subject: [PATCH] white space :) added some log lines

git-svn-id: svn://svn.open-ils.org/ILS/trunk@3276 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/src/c-apps/oils_auth.c               | 41 +++++++++++--------
 .../OpenILS/Application/Search/Biblio.pm      |  4 ++
 OpenSRF/src/libstack/osrf_cache.c             |  2 +
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/Open-ILS/src/c-apps/oils_auth.c b/Open-ILS/src/c-apps/oils_auth.c
index 15986e2747..f560dd0514 100644
--- a/Open-ILS/src/c-apps/oils_auth.c
+++ b/Open-ILS/src/c-apps/oils_auth.c
@@ -394,6 +394,7 @@ oilsEvent*  _oilsAuthResetTimeout( char* authToken ) {
 	jsonObject* cacheObj = osrfCacheGetObject( key ); 
 
 	if(!cacheObj) {
+		osrfLogError(OSRF_LOG_MARK, "No user in the cache exists with key %s", key);
 		evt = oilsNewEvent(OILS_EVENT_NO_SESSION);
 
 	} else {
@@ -425,29 +426,37 @@ int oilsAuthSessionRetrieve( osrfMethodContext* ctx ) {
 
 	char* authToken = jsonObjectGetString( jsonObjectGetIndex(ctx->params, 0));
 	jsonObject* cacheObj = NULL;
+	oilsEvent* evt = NULL;
 
 	if( authToken ){
 
-		if(1) {
-			oilsEvent* evt = _oilsAuthResetTimeout(authToken);
-			if( evt && strcmp(evt->event, OILS_EVENT_SUCCESS) ) {
-				osrfAppRespondComplete( ctx, oilsEventToJSON(evt) );
+		evt = _oilsAuthResetTimeout(authToken);
+
+		if( evt && strcmp(evt->event, OILS_EVENT_SUCCESS) ) {
+			osrfAppRespondComplete( ctx, oilsEventToJSON(evt) );
+			oilsEventFree(evt);
+
+		} else {
+
+			osrfLogDebug(OSRF_LOG_MARK, "Retrieving auth session: %s", authToken);
+			char* key = va_list_to_string("%s%s", OILS_AUTH_CACHE_PRFX, authToken ); 
+			cacheObj = osrfCacheGetObject( key ); 
+			if(cacheObj) {
+				osrfAppRespondComplete( ctx, jsonObjectGetKey( cacheObj, "userobj"));
+				jsonObjectFree(cacheObj);
+			} else {
+				oilsEvent* evt = oilsNewEvent(OILS_EVENT_NO_SESSION);
+				osrfAppRespondComplete( ctx, oilsEventToJSON(evt) ); /* should be event.. */
 				oilsEventFree(evt);
 			}
+			free(key);
 		}
 
-		osrfLogDebug(OSRF_LOG_MARK, "Retrieving auth session: %s", authToken);
-		char* key = va_list_to_string("%s%s", OILS_AUTH_CACHE_PRFX, authToken ); 
-		cacheObj = osrfCacheGetObject( key ); 
-		if(cacheObj) {
-			osrfAppRespondComplete( ctx, jsonObjectGetKey( cacheObj, "userobj"));
-			jsonObjectFree(cacheObj);
-		} else {
-			oilsEvent* evt = oilsNewEvent(OILS_EVENT_NO_SESSION);
-			osrfAppRespondComplete( ctx, oilsEventToJSON(evt) ); /* should be event.. */
-			oilsEventFree(evt);
-		}
-		free(key);
+	} else {
+
+		evt = oilsNewEvent(OILS_EVENT_NO_SESSION);
+		osrfAppRespondComplete( ctx, oilsEventToJSON(evt) );
+		oilsEventFree(evt);
 	}
 
 	return 0;
diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
index d92661571d..cc13df78f7 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
@@ -955,4 +955,8 @@ sub fetch_cn {
 
 
 
+
+
 1;
+
+
diff --git a/OpenSRF/src/libstack/osrf_cache.c b/OpenSRF/src/libstack/osrf_cache.c
index 7936ca0bdc..13cb272f68 100644
--- a/OpenSRF/src/libstack/osrf_cache.c
+++ b/OpenSRF/src/libstack/osrf_cache.c
@@ -60,6 +60,7 @@ jsonObject* osrfCacheGetObject( char* key, ... ) {
 			obj = jsonParseString( data );
 			return obj;
 		}
+		osrfLogWarning(OSRF_LOG_MARK, "No cache data exists with key %s", VA_BUF);
 	}
 	return NULL;
 }
@@ -69,6 +70,7 @@ char* osrfCacheGetString( char* key, ... ) {
 		VA_LIST_TO_STRING(key);
 		char* data = (char*) mc_aget(__osrfCache, VA_BUF, strlen(VA_BUF) );
 		osrfLogInternal( OSRF_LOG_MARK, "osrfCacheGetObject(): Returning object: %s", data);
+		if(!data) osrfLogWarning(OSRF_LOG_MARK, "No cache data exists with key %s", VA_BUF);
 		return data;
 	}
 	return NULL;
-- 
2.43.2