From a306b84c011c2eb4a2fffd622cd256a4e18b0ef9 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sat, 13 Jun 2020 19:23:39 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/LicenseController.cs | 12 ++++++++++-- server/AyaNova/util/License.cs | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/server/AyaNova/Controllers/LicenseController.cs b/server/AyaNova/Controllers/LicenseController.cs index 2a9627aa..5dc0101a 100644 --- a/server/AyaNova/Controllers/LicenseController.cs +++ b/server/AyaNova/Controllers/LicenseController.cs @@ -117,9 +117,17 @@ namespace AyaNova.Api.Controllers try { var ret = await AyaNova.Core.License.FetchKeyAsync(serverState, ct, log, false); - //Log - await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.License, AyaEvent.LicenseFetch), ct); + //most often the result will be not found but in future might be other results + //main thing is to not log anything but OK response + if (ret == "ok") + { + //Log + await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.License, AyaEvent.LicenseFetch), ct); + } + + //any response here is OK, there's not necessarily an error, just no key or some mundane problem not technical but biz so let + //ret string instruct client on what to do return Ok(ret); } catch (Exception ex) diff --git a/server/AyaNova/util/License.cs b/server/AyaNova/util/License.cs index a6f91507..cd3fed22 100644 --- a/server/AyaNova/util/License.cs +++ b/server/AyaNova/util/License.cs @@ -499,14 +499,24 @@ namespace AyaNova.Core } return $"E1020 - Error fetching license key: No key was returned"; } - else + else{ + //some kind of server error?? + if((int)res.StatusCode > 499){ + return $"E1020 - License server error fetching license key, contact technical support: {res.ReasonPhrase}"; + } + //If it's NOT FOUND, that's not an error, just a normal response to be expected + if(res.StatusCode== System.Net.HttpStatusCode.NotFound){ + return "notfound"; + } + return $"E1020 - Error fetching license key: {res.ReasonPhrase}"; + } } catch (Exception ex) { if (calledFromInternalJob) throw ex; - var msg = "E1020 - Error fetching license key"; + var msg = "E1020 - Error fetching / installing license key"; log.LogError(ex, msg); return msg; }