- Add a preference (currently with no UI) for connection timeout

 - Improve connection error messages slightly.
 - Avoid reading prefs for every keepalive check - now sets connection timeout and keepalive interval on connection setup
 - Fix and extend connection checks to avoid showing extra errors when the connection has been closed

1 files changed, 2 insertions, 6 deletions

diff --git a/Source/CMMCPConnection.h b/Source/CMMCPConnection.h
index b26319ee..70b460f1 100644
--- a/Source/CMMCPConnection.h
+++ b/Source/CMMCPConnection.h
@@ -26,11 +26,6 @@
 #import <MCPKit_bundled/MCPKit_bundled.h>
 #import "CMMCPResult.h"
 
-// Set the connection timeout to enforce for all connections - used for the initial connection
-// timeout and ping timeouts, but not for long queries/reads/writes.
-// Probably worth moving this to a preference at some point.
-#define SP_CONNECTION_TIMEOUT 10
-
 @interface NSObject (CMMCPConnectionDelegate)
 
 - (void)willQueryString:(NSString *)query;
@@ -50,6 +45,8 @@
 	int connectionPort;
 	NSString *connectionSocket;
 	float lastQueryExecutionTime;
+	int connectionTimeout;
+	float keepAliveInterval;
 	
 	NSTimer *keepAliveTimer;
 	NSDate *lastKeepAliveSuccess;
@@ -73,7 +70,6 @@
 - (void) setDelegate:(id)object;
 - (NSTimeZone *) timeZone;
 - (BOOL) pingConnection;
-- (double) keepAliveInterval;
 - (void) startKeepAliveTimerResettingState:(BOOL)resetState;
 - (void) stopKeepAliveTimer;
 - (void) keepAlive:(NSTimer *)theTimer;