Skip to content

Fix error suppression logic #2

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

Open
c1982 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix error suppression logic #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 12 additions & 14 deletions Boot/Assets/Scripts/GameBootStrapper.Unity/Runtime/GameBootStrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public static async Task<BootStrapResult> RunTasks(Action<int> progress, BootStr
params Func<BootStrapContext, BootStrapResult>[] tasks)
{
ctx.totalTaskCount = tasks.Length;
var parallelTasks = new List<Task<BootStrapResult>>();
var parallelTasks = new List<(Task<BootStrapResult> Task, bool Suppress)>();
foreach (var fn in tasks)
{
var meta = fn.Method.GetCustomAttribute<BootStepAttribute>();
Expand All @@ -25,24 +25,25 @@ public static async Task<BootStrapResult> RunTasks(Action<int> progress, BootStr
{
case BootStrapTaskType.Sequential:
var result = await ExecuteTaskAsync(fn, ctx, progress, meta);
if (!result.Success)
if (!result.Success && !meta.SuppressError)
return result;
break;
case BootStrapTaskType.Parallel:
parallelTasks.Add(ExecuteTaskAsync(fn, ctx, progress, meta));
parallelTasks.Add((ExecuteTaskAsync(fn, ctx, progress, meta), meta.SuppressError));
break;
case BootStrapTaskType.Forget:
_ = ExecuteTaskAsync(fn, ctx, progress, meta);
break;
}
}

if (!parallelTasks.Any())
if (!parallelTasks.Any())
return new BootStrapResult() { Success = true };

var parallelTaskResults = await Task.WhenAll(parallelTasks);
var failedTaskResult = parallelTaskResults.FirstOrDefault(r => !r.Success);


var parallelTaskResults = await Task.WhenAll(parallelTasks.Select(p => p.Task));
var zipped = parallelTaskResults.Zip(parallelTasks, (result, info) => new { result, info.Suppress });
var failedTaskResult = zipped.FirstOrDefault(p => !p.result.Success && !p.Suppress)?.result;

return failedTaskResult ?? new BootStrapResult { Success = true };
}

Expand All @@ -51,19 +52,16 @@ private static async Task<BootStrapResult> ExecuteTaskAsync(Func<BootStrapContex
{
try
{
var result = await Task.Run(() => Task.FromResult(task(ctx)), cancellationToken: ctx.ct)
var result = await Task.Run(() => task(ctx), ctx.ct)
.TimeOut(meta.Timeout, ctx.ct);

ctx.IncrementCompletedTaskCount();
progress?.Invoke(CalculateProgressPercentage(ctx));
Debug.Log($"Step {task.Method.Name} completed with result: {result.Success}");

if(meta.SuppressError)
return new BootStrapResult(){ Success = true , Message = "Suppressed error"};

if (!result.Success)
if (!result.Success && !meta.SuppressError)
ctx.cancellationTokenSource.Cancel();

return result;
}
catch (Exception ex)
Expand Down