Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Windows] Unwrap AggregateException when catching exceptions from Task.Wait() method #602

Merged
merged 9 commits into from
Apr 16, 2018
Merged

[Windows] Unwrap AggregateException when catching exceptions from Task.Wait() method #602

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
afb56ed
Unwrap AggregateException on calling Task.Wait() method
snrnats Feb 19, 2018
923e5b0
Use GetAwaiter().GetResult instead of util method
snrnats Feb 21, 2018
a4ea73c
Use GetAwaiter().GetResult() instead of Result to get original except…
snrnats Feb 22, 2018
080976a
Updated unit tests to properly detect exceptions thrown by Storage
snrnats Feb 22, 2018
1d9c724
Inlined GetAwaiter().GetResult() in unit tests
snrnats Feb 23, 2018
ade9829
Inlined GetAwaiter().GetResult() in unit tests (reverted from commit …
snrnats Apr 14, 2018
9b0a608
Merge branch 'develop' into develop-snrnats
snrnats Apr 14, 2018
ada7d55
Removed unused 'using'
snrnats Apr 14, 2018
7478fca
Use Mock.Returns() with faulted task until Mock.ThrowsAsync is fixed.
snrnats Apr 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...AppCenter/Microsoft.AppCenter.Windows.Shared/Microsoft.AppCenter.Windows.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Utils\Synchronization\State.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Utils\Synchronization\StatefulMutex.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Utils\Synchronization\StatefulMutexException.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Utils\TaskExtension.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Utils\TimeHelper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Utils\UnhandledExceptionOccurredEventArgs.cs" />
</ItemGroup>
Expand Down
11 changes: 6 additions & 5 deletions SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Storage/Storage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Threading.Tasks;
using Microsoft.AppCenter.Ingestion.Models;
using Microsoft.AppCenter.Ingestion.Models.Serialization;
using Microsoft.AppCenter.Utils;
using Newtonsoft.Json;
using SQLite;

Expand Down Expand Up @@ -52,7 +53,7 @@ public Storage() : this(DefaultAdapter())
internal Storage(IStorageAdapter adapter)
{
_storageAdapter = adapter;
_queue.Add(new Task(() => InitializeDatabaseAsync().Wait()));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like @MatkovIvan mentioned in a conversation we had, just using .GetAwaiter().GetResult() would remove the need for an extension utils, please switch to that and remove the additional extension.

_queue.Add(new Task(() => InitializeDatabaseAsync().RunNotAsync()));
_queueFlushTask = Task.Run(FlushQueueAsync);
}

Expand Down Expand Up @@ -87,7 +88,7 @@ public Task PutLog(string channelName, Log log)
{
var logJsonString = LogSerializer.Serialize(log);
var logEntry = new LogEntry {Channel = channelName, Log = logJsonString};
_storageAdapter.InsertAsync(logEntry).Wait();
_storageAdapter.InsertAsync(logEntry).RunNotAsync();
});
try
{
Expand Down Expand Up @@ -128,7 +129,7 @@ public Task DeleteLogs(string channelName, string batchId)
{
_storageAdapter
.DeleteAsync<LogEntry>(entry => entry.Channel == channelName && entry.Id == id)
.Wait();
.RunNotAsync();
}
}
catch (KeyNotFoundException e)
Expand Down Expand Up @@ -163,7 +164,7 @@ public Task DeleteLogs(string channelName)
$"Deleting all logs from storage for channel '{channelName}'");
ClearPendingLogStateWithoutEnqueue(channelName);
_storageAdapter.DeleteAsync<LogEntry>(entry => entry.Channel == channelName)
.Wait();
.RunNotAsync();
}
catch (KeyNotFoundException e)
{
Expand Down Expand Up @@ -290,7 +291,7 @@ public async Task<string> GetLogsAsync(string channelName, int limit, List<Log>
AppCenterLog.Error(AppCenterLog.LogTag, "Cannot deserialize a log in storage", e);
failedToDeserializeALog = true;
_storageAdapter.DeleteAsync<LogEntry>(row => row.Id == entry.Id)
.Wait();
.RunNotAsync();
}
}
if (failedToDeserializeALog)
Expand Down
34 changes: 34 additions & 0 deletions SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Utils/TaskExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
using System;
using System.Threading.Tasks;

namespace Microsoft.AppCenter.Utils
{
internal static class TaskExtension
{
public static T RunNotAsync<T>(this Task<T> @this)
{
try
{
@this.Wait();
}
catch (AggregateException e)
{
throw e.InnerException;
}

return @this.Result;
}

public static void RunNotAsync(this Task @this)
{
try
{
@this.Wait();
}
catch (AggregateException e)
{
throw e.InnerException;
}
}
}
}