Merge pull request Redth#274 from JasonGit/master

Redth · Redth · commit 0793ab03ac85 · 2013-10-31T04:27:16.000-07:00
Resolve issue 244: After the PushSharp lib (v2.1.2) is idle for 5 mins, ...
diff --git a/PushSharp.Core/PushServiceBase.cs b/PushSharp.Core/PushServiceBase.cs
@@ -289,7 +289,9 @@ private void CheckScale(object state = null)
 							Log.Info("{0} -> Destroying Channel", this);
 							ScaleChannels(ChannelScaleAction.Destroy);
 						}
-						while (channels.Count < ServiceSettings.Channels && !this.cancelTokenSource.IsCancellationRequested)
+                        while (channels.Count < ServiceSettings.Channels && !this.cancelTokenSource.IsCancellationRequested
+                            && (DateTime.UtcNow - lastNotificationQueueTime) <= ServiceSettings.IdleTimeout
+                            && Interlocked.Read(ref trackedNotificationCount) > 0)
 						{
 							Log.Info("{0} -> Creating Channel", this);
 							ScaleChannels(ChannelScaleAction.Create);

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,9 @@ private void CheckScale(object state = null)`
`289`	`289`	`Log.Info("{0} -> Destroying Channel", this);`
`290`	`290`	`ScaleChannels(ChannelScaleAction.Destroy);`
`291`	`291`	`}`
`292`		`- while (channels.Count < ServiceSettings.Channels && !this.cancelTokenSource.IsCancellationRequested)`
	`292`	`+ while (channels.Count < ServiceSettings.Channels && !this.cancelTokenSource.IsCancellationRequested`
	`293`	`+ && (DateTime.UtcNow - lastNotificationQueueTime) <= ServiceSettings.IdleTimeout`
	`294`	`+ && Interlocked.Read(ref trackedNotificationCount) > 0)`
`293`	`295`	`{`
`294`	`296`	`Log.Info("{0} -> Creating Channel", this);`
`295`	`297`	`ScaleChannels(ChannelScaleAction.Create);`