Add timeout to AI flush

xindzhan · xindzhan · commit 6fe23500361a · 2015-09-04T14:58:54.000-07:00
diff --git a/src/Common/Commands.Common/MetricHelper.cs b/src/Common/Commands.Common/MetricHelper.cs
@@ -14,6 +14,7 @@ namespace Microsoft.WindowsAzure.Commands.Common
 {
     public static class MetricHelper
     {
+        private const int FlushTimeoutInMilli = 5000;
         private static readonly TelemetryClient TelemetryClient;
 
         static MetricHelper()
@@ -94,13 +95,10 @@ public static void FlushMetric(bool waitForMetricSending)
                 return;
             }
 
+            var flushTask = Task.Run(() => FlushAi());
             if (waitForMetricSending)
             {
-                FlushAi();
-            }
-            else
-            {
-                Task.Run(() => FlushAi());
+                Task.WaitAll(new[] { flushTask }, FlushTimeoutInMilli);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ namespace Microsoft.WindowsAzure.Commands.Common`
`14`	`14`	`{`
`15`	`15`	`public static class MetricHelper`
`16`	`16`	`{`
	`17`	`+ private const int FlushTimeoutInMilli = 5000;`
`17`	`18`	`private static readonly TelemetryClient TelemetryClient;`
`18`	`19`
`19`	`20`	`static MetricHelper()`
`@@ -94,13 +95,10 @@ public static void FlushMetric(bool waitForMetricSending)`
`94`	`95`	`return;`
`95`	`96`	`}`
`96`	`97`
	`98`	`+ var flushTask = Task.Run(() => FlushAi());`
`97`	`99`	`if (waitForMetricSending)`
`98`	`100`	`{`
`99`		`- FlushAi();`
`100`		`- }`
`101`		`- else`
`102`		`- {`
`103`		`- Task.Run(() => FlushAi());`
	`101`	`+ Task.WaitAll(new[] { flushTask }, FlushTimeoutInMilli);`
`104`	`102`	`}`
`105`	`103`	`}`
`106`	`104`