Merge pull request #1 from maverix/Timeout-Enhancement

Added Disposable SetTimeoutFor to IDocumentStore

Raven.Client.Lightweight/Connection/HttpJsonRequestFactory.cs

@@ -72,6 +72,10 @@ public HttpJsonRequest CreateHttpJsonRequest(CreateHttpJsonRequestParams createH
 				request.CachedRequestDetails = cachedRequestDetails.CachedRequest;
 				request.SkipServerCheck = cachedRequestDetails.SkipServerCheck;
 			}
+
+			if (SessionTimeout != null && SessionTimeout.HasValue && SessionTimeout.Value.TotalSeconds > 1)
+				request.Timeout = SessionTimeout.Value;
+
 			ConfigureRequest(createHttpJsonRequestParams.Owner, new WebRequestEventArgs {Request = request.webRequest});
 			return request;
 		}
@@ -172,6 +176,14 @@ public TimeSpan? AggressiveCacheDuration
 			set { aggressiveCacheDuration.Value = value; }
 		}
 
+		///<summary>
+		/// Session timeout - Thread Local
+		///</summary>
+		public TimeSpan? SessionTimeout {
+			get { return sessionTimeout.Value; }
+			set { sessionTimeout.Value = value; }
+		}
+
 		/// <summary>
 		/// Disable the HTTP caching
 		/// </summary>
@@ -191,7 +203,7 @@ public bool DisableHttpCaching
 		public bool EnableBasicAuthenticationOverUnsecuredHttpEvenThoughPasswordsWouldBeSentOverTheWireInClearTextToBeStolenByHackers { get; set; }
 
 		private readonly ThreadLocal<TimeSpan?> aggressiveCacheDuration = new ThreadLocal<TimeSpan?>(() => null);
-
+		private readonly ThreadLocal<TimeSpan?> sessionTimeout = new ThreadLocal<TimeSpan?>(() => null);
 		private readonly ThreadLocal<bool> disableHttpCaching = new ThreadLocal<bool>(() => false);
 
 		private volatile bool disposed;
@@ -243,10 +255,11 @@ public void Dispose()
 		{
 			if (disposed)
 				return;
-		    disposed = true;
+			disposed = true;
 			cache.Dispose();
 			aggressiveCacheDuration.Dispose();
 			disableHttpCaching.Dispose();
+			sessionTimeout.Dispose();
 		}
 
 		internal void UpdateCacheTime(HttpJsonRequest httpJsonRequest)

Raven.Client.Lightweight/Document/DocumentStore.cs

@@ -762,6 +762,31 @@ public override IDisposable AggressivelyCacheFor(TimeSpan cacheDuration)
 #endif
 		}
 
+		/// <summary>
+		/// Setup the WebRequest timeout for the session
+		/// </summary>
+		/// <param name="timeout">Specify the timeout duration</param>
+		/// <remarks>
+		/// Sets the timeout for the JsonRequest.  Scoped to the Current Thread.
+		/// </remarks>
+		public override IDisposable SetTimeoutFor(TimeSpan timeout) {
+			AssertInitialized();
+#if !SILVERLIGHT && !NETFX_CORE
+			if (timeout.TotalSeconds < 1)
+				throw new ArgumentException("timeout must be longer than a single second");
+
+			var old = jsonRequestFactory.SessionTimeout;
+			jsonRequestFactory.SessionTimeout = timeout;
+
+			return new DisposableAction(() => {
+				jsonRequestFactory.SessionTimeout = old;
+			});
+#else
+			// TODO: with silverlight, we don't currently support session timeout
+			return new DisposableAction(() => { });
+#endif
+		}
+
 		private IAsyncDocumentSession OpenAsyncSessionInternal(string dbName, IAsyncDatabaseCommands asyncDatabaseCommands)
 		{
 			AssertInitialized();
@@ -776,7 +801,7 @@ private IAsyncDocumentSession OpenAsyncSessionInternal(string dbName, IAsyncData
 
 				var session = new AsyncDocumentSession(dbName, this, asyncDatabaseCommands, listeners, sessionId)
 				{
-				    DatabaseName = dbName ?? DefaultDatabase
+					DatabaseName = dbName ?? DefaultDatabase
 				};
 				AfterSessionCreated(session);
 				return session;
@@ -810,7 +835,7 @@ public override IAsyncDocumentSession OpenAsyncSession(string databaseName)
 
 		public IAsyncDocumentSession OpenAsyncSession(OpenSessionOptions options)
 		{
-            return OpenAsyncSessionInternal(options.Database, SetupCommandsAsync(AsyncDatabaseCommands, options.Database, options.Credentials, options));
+			return OpenAsyncSessionInternal(options.Database, SetupCommandsAsync(AsyncDatabaseCommands, options.Database, options.Credentials, options));
 		}
 
 		/// <summary>

Raven.Client.Lightweight/DocumentStoreBase.cs

@@ -59,6 +59,8 @@ protected DocumentStoreBase()
 
 		public abstract IDisposable DisableAggressiveCaching();
 
+		public abstract IDisposable SetTimeoutFor(TimeSpan timeout);
+
 #if !SILVERLIGHT && !NETFX_CORE
 		/// <summary>
 		/// Gets the shared operations headers.

Raven.Client.Lightweight/IDocumentStore.cs

@@ -65,6 +65,15 @@ public interface IDocumentStore : IDisposalNotification
 		/// </remarks>
 		IDisposable DisableAggressiveCaching();
 
+		/// <summary>
+		/// Setup the WebRequest timeout for the session
+		/// </summary>
+		/// <param name="timeout">Specify the timeout duration</param>
+		/// <remarks>
+		/// Sets the timeout for the JsonRequest.  Scoped to the Current Thread.
+		/// </remarks>
+		IDisposable SetTimeoutFor(TimeSpan timeout);
+
 		/// <summary>
 		/// Gets the shared operations headers.
 		/// </summary>

Raven.Client.Lightweight/Shard/ShardedDocumentStore.cs

@@ -199,6 +199,24 @@ public override IDisposable DisableAggressiveCaching()
 			});
 		}
 
+		/// <summary>
+		/// Setup the WebRequest timeout for the session
+		/// </summary>
+		/// <param name="timeout">Specify the timeout duration</param>
+		/// <remarks>
+		/// Sets the timeout for the JsonRequest.  Scoped to the Current Thread.
+		/// </remarks>
+		public override IDisposable SetTimeoutFor(TimeSpan timeout) {
+			var disposables =
+				ShardStrategy.Shards.Select(shard => shard.Value.SetTimeoutFor(timeout)).ToList();
+
+			return new DisposableAction(() => {
+				foreach (var disposable in disposables) {
+					disposable.Dispose();
+				}
+			});
+		}
+
 #if !SILVERLIGHT && !NETFX_CORE
 
 		/// <summary>