From: Mike Rylander <mrylander@gmail.com>
Date: Tue, 9 Aug 2011 18:17:00 +0000 (-0400)
Subject: Branchify patch from LP bug #702206 for rel_2_0.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fcollab%2Fdyrcona%2Flp702206_2_0;p=working%2FEvergreen.git

Branchify patch from LP bug #702206 for rel_2_0.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
---

diff --git a/Open-ILS/src/c-apps/oils_sql.c b/Open-ILS/src/c-apps/oils_sql.c
index 852c45fe89..e45b10c207 100644
--- a/Open-ILS/src/c-apps/oils_sql.c
+++ b/Open-ILS/src/c-apps/oils_sql.c
@@ -330,6 +330,17 @@ int oilsExtendIDL( dbi_conn handle ) {
 	growing_buffer* query_buf = buffer_init( 64 );
 	int results_found = 0;   // boolean
 
+    // Set a statement timeout of 1 second
+	dbi_result result = dbi_conn_query( handle, "SET statement_timeout TO 5000;" );
+	if( result ) {
+		dbi_result_free( result  );
+    } else {
+		const char* msg;
+		int errnum = dbi_conn_error( handle, &msg );
+		osrfLogError( OSRF_LOG_MARK, "Could not set session timeout! %s",
+			 msg ? msg : "(No description available)" );
+    }
+
 	// For each class in the IDL...
 	while( (class = osrfHashIteratorNext( class_itr ) ) ) {
 		const char* classname = osrfHashIteratorKey( class_itr );
@@ -353,7 +364,7 @@ int oilsExtendIDL( dbi_conn handle ) {
 		osrfLogDebug( OSRF_LOG_MARK, "%s Investigatory SQL = %s",
 				modulename, OSRF_BUFFER_C_STR( query_buf ) );
 
-		dbi_result result = dbi_conn_query( handle, OSRF_BUFFER_C_STR( query_buf ) );
+		result = dbi_conn_query( handle, OSRF_BUFFER_C_STR( query_buf ) );
 		if( result ) {
 
 			results_found = 1;
@@ -440,6 +451,17 @@ int oilsExtendIDL( dbi_conn handle ) {
 	osrfHashIteratorFree( class_itr );
 	child_initialized = 1;
 
+    // Unset a statement timeout of 1 second
+	result = dbi_conn_query( handle, "SET statement_timeout TO DEFAULT;" );
+	if( result ) {
+		dbi_result_free( result  );
+    } else {
+		const char* msg;
+		int errnum = dbi_conn_error( handle, &msg );
+		osrfLogError( OSRF_LOG_MARK, "Could not set session timeout! %s",
+			 msg ? msg : "(No description available)" );
+    }
+
 	if( !results_found ) {
 		osrfLogError( OSRF_LOG_MARK,
 			"No results found for any class -- bad database connection?" );