From 5ee6c9058673e62599716e9fb63d28c96261ccd3 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 27 Jan 2020 22:52:21 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/UserOptionsController.cs | 4 ++-- server/AyaNova/Controllers/WidgetController.cs | 4 ++-- server/AyaNova/generator/CoreJobMetricsSnapshot.cs | 4 ++-- server/AyaNova/generator/CoreJobSweeper.cs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/AyaNova/Controllers/UserOptionsController.cs b/server/AyaNova/Controllers/UserOptionsController.cs index 65a1c0aa..d2acc9c6 100644 --- a/server/AyaNova/Controllers/UserOptionsController.cs +++ b/server/AyaNova/Controllers/UserOptionsController.cs @@ -124,7 +124,7 @@ namespace AyaNova.Api.Controllers try { - if (!biz.PutAsync(o, inObj)) + if (!await biz.PutAsync(o, inObj)) { return BadRequest(new ApiErrorResponse(biz.Errors)); } @@ -189,7 +189,7 @@ namespace AyaNova.Api.Controllers try { //patch and validate - if (!biz.PatchAsync(o, objectPatch, concurrencyToken)) + if (!await biz.PatchAsync(o, objectPatch, concurrencyToken)) { return BadRequest(new ApiErrorResponse(biz.Errors)); } diff --git a/server/AyaNova/Controllers/WidgetController.cs b/server/AyaNova/Controllers/WidgetController.cs index 0f2c91dc..b55aa9f2 100644 --- a/server/AyaNova/Controllers/WidgetController.cs +++ b/server/AyaNova/Controllers/WidgetController.cs @@ -298,7 +298,7 @@ namespace AyaNova.Api.Controllers /// /// Nothing [HttpGet("TestWidgetJob")] - public ActionResult TestWidgetJob() + public async Task TestWidgetJob() { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); @@ -310,7 +310,7 @@ namespace AyaNova.Api.Controllers OpsJob j = new OpsJob(); j.Name = "TestWidgetJob"; j.JobType = JobType.TestWidgetJob; - JobsBiz.AddJobAsync(j, ct); + await JobsBiz.AddJobAsync(j, ct); return Accepted(new { JobId = j.GId });//202 accepted } diff --git a/server/AyaNova/generator/CoreJobMetricsSnapshot.cs b/server/AyaNova/generator/CoreJobMetricsSnapshot.cs index 3fa6c283..30e4b96c 100644 --- a/server/AyaNova/generator/CoreJobMetricsSnapshot.cs +++ b/server/AyaNova/generator/CoreJobMetricsSnapshot.cs @@ -64,7 +64,7 @@ namespace AyaNova.Biz //Get a count of important tables in db - List allTableNames = DbUtil.GetAllTablenamesAsync(); + List allTableNames = await DbUtil.GetAllTablenamesAsync(); //Skip some tables as they are internal and / or only ever have one record List skipTableNames = new List(); @@ -76,7 +76,7 @@ namespace AyaNova.Biz if (!skipTableNames.Contains(table)) { var tags = new MetricTags("TableTagKey", table); - metrics.Measure.Gauge.SetValue(MetricsRegistry.DBRecordsGauge, tags, DbUtil.CountOfRecordsAsync(table)); + metrics.Measure.Gauge.SetValue(MetricsRegistry.DBRecordsGauge, tags, await DbUtil.CountOfRecordsAsync(table)); } } } diff --git a/server/AyaNova/generator/CoreJobSweeper.cs b/server/AyaNova/generator/CoreJobSweeper.cs index ab18994a..52667347 100644 --- a/server/AyaNova/generator/CoreJobSweeper.cs +++ b/server/AyaNova/generator/CoreJobSweeper.cs @@ -111,9 +111,9 @@ namespace AyaNova.Biz foreach (OpsJob j in jobs) { //OPSMETRIC - JobsBiz.LogJobAsync(j.GId, "Job took too long to run - setting to failed", ct); + await JobsBiz.LogJobAsync(j.GId, "Job took too long to run - setting to failed", ct); log.LogError($"Job found job stuck in running status and set to failed: deadline={dtRunningDeadline.ToString()}, jobId={j.GId.ToString()}, jobname={j.Name}, jobtype={j.JobType.ToString()}, jobObjectType={j.ObjectType.ToString()}, jobObjectId={j.ObjectId.ToString()}"); - JobsBiz.UpdateJobStatusAsync(j.GId, JobStatus.Failed, ct); + await JobsBiz.UpdateJobStatusAsync(j.GId, JobStatus.Failed, ct); } }