From e97e36f6ef01fe733e1f4bd588eb2f54881835a5 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 25 Aug 2018 10:07:35 -0500 Subject: [PATCH] Revert "de-async batch saving to try reducing crashes" This reverts commit 951a4b345a597b2af3461b8d8899faad2bcfc621. --- src/FilterLists.Services/Snapshot/Batch.cs | 4 ++-- src/FilterLists.Services/Snapshot/Snapshot.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/FilterLists.Services/Snapshot/Batch.cs b/src/FilterLists.Services/Snapshot/Batch.cs index 7ee61fa05..c53467780 100644 --- a/src/FilterLists.Services/Snapshot/Batch.cs +++ b/src/FilterLists.Services/Snapshot/Batch.cs @@ -20,11 +20,11 @@ public Batch(FilterListsDbContext dbContext, IEnumerable lines, Data.Ent this.snapEntity = snapEntity; } - public void Save() + public async Task SaveAsync() { var rules = GetOrCreateRules(); CreateSnapRules(rules); - dbContext.SaveChanges(); + await dbContext.SaveChangesAsync(); } private IQueryable GetOrCreateRules() diff --git a/src/FilterLists.Services/Snapshot/Snapshot.cs b/src/FilterLists.Services/Snapshot/Snapshot.cs index 09442cd70..f681e6c2a 100644 --- a/src/FilterLists.Services/Snapshot/Snapshot.cs +++ b/src/FilterLists.Services/Snapshot/Snapshot.cs @@ -122,7 +122,7 @@ private async Task GetLines() private async Task SaveInBatches() { var snapBatches = await CreateBatches(); - SaveBatches(snapBatches); + await SaveBatches(snapBatches); } private async Task> CreateBatches() @@ -131,10 +131,10 @@ private async Task> CreateBatches() return lines.Batch(SnapEntity.BatchSize.Value).Select(b => new Batch(dbContext, b, SnapEntity)); } - private static void SaveBatches(IEnumerable batches) + private static async Task SaveBatches(IEnumerable batches) { foreach (var batch in batches) - batch.Save(); + await batch.SaveAsync(); } private async Task SetSuccessful()