From 1561f932ee92fdd94fb6ec7dc6113d23bc57b97f Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sun, 14 Jun 2020 18:18:40 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/util/License.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 47a5435c..379d2046 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -44,7 +44,7 @@ //"AYANOVA_LOG_LEVEL": "Debug", "AYANOVA_DEFAULT_TRANSLATION": "en", //TRANSLATION MUST BE en for Integration TESTING - "AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", + //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;", "AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", diff --git a/server/AyaNova/util/License.cs b/server/AyaNova/util/License.cs index d5ddcba3..fb7549ef 100644 --- a/server/AyaNova/util/License.cs +++ b/server/AyaNova/util/License.cs @@ -484,7 +484,7 @@ namespace AyaNova.Core /// Result string internal static async Task FetchKeyAsync(AyaNova.Api.ControllerHelpers.ApiServerState apiServerState, AyContext ct, ILogger log, bool calledFromInternalJob = true) { - log.LogDebug($"Fetching license for DBID {LicenseDbId.ToString()}"); + log.LogInformation($"Fetching license for DBID {LicenseDbId.ToString()}"); string sUrl = $"{LICENSE_SERVER_URL}rvf/{LicenseDbId.ToString()}"; try { @@ -498,9 +498,11 @@ namespace AyaNova.Core var keyText = responseJson["data"]["key"].Value(); AyaNovaLicenseKey ParsedKey = Parse(keyText, log); + if (ParsedKey != null) { await InstallAsync(keyText, ParsedKey, apiServerState, ct, log); + log.LogInformation($"Installed new license key {ParsedKey.Id}"); return "ok"; } return $"E1020 - Error fetching license key: No key was returned";