diff --git a/server/AyaNova/util/AyaNovaVersion.cs b/server/AyaNova/util/AyaNovaVersion.cs index 25ed9bb4..71683d7a 100644 --- a/server/AyaNova/util/AyaNovaVersion.cs +++ b/server/AyaNova/util/AyaNovaVersion.cs @@ -5,7 +5,7 @@ namespace AyaNova.Util /// internal static class AyaNovaVersion { - public const string VersionString = "8.0.0-alpha.138"; + public const string VersionString = "8.0.0-alpha.139"; public const string FullNameAndVersion = "AyaNova server " + VersionString; }//eoc }//eons \ No newline at end of file diff --git a/server/AyaNova/util/License.cs b/server/AyaNova/util/License.cs index 4e6d937d..e413d237 100644 --- a/server/AyaNova/util/License.cs +++ b/server/AyaNova/util/License.cs @@ -507,15 +507,12 @@ namespace AyaNova.Core log.LogInformation($"Fetching license for DBID {LicenseDbId}"); var FetchRequest = new dtoFetchRequest() { DbId = LicenseDbId }; - string AppendToLicenseUrl=string.Empty; + string LicenseUrlParameter = "rvf"; #if (DEBUG) - AppendToLicenseUrl = "rvf"; if (devTestTrial) { - AppendToLicenseUrl += "?dtt=true";//signal to rockfish to provide a key immediately for dev testing + LicenseUrlParameter += "?dtt=true";//signal to rockfish to provide a key immediately for dev testing } -#else - string sUrl = $"rvf"; #endif try @@ -524,7 +521,7 @@ namespace AyaNova.Core var client = ServiceProviderProvider.HttpClientFactory.CreateClient(); HttpResponseMessage res = null; - res = await DoFetchAsync(AppendToLicenseUrl, content, client); + res = await DoFetchAsync(LicenseUrlParameter, content, client); if (res.IsSuccessStatusCode) { var responseText = await res.Content.ReadAsStringAsync(); @@ -592,7 +589,7 @@ namespace AyaNova.Core } } - private static async Task DoFetchAsync(string AppendToLicenseUrl, StringContent content, HttpClient client) + private static async Task DoFetchAsync(string LicenseUrlParameters, StringContent content, HttpClient client) { var LicenseServer = string.Empty; for (int x = 0; x < 4; x++) @@ -611,19 +608,20 @@ namespace AyaNova.Core LicenseServer = LICENSE_SERVER_URL_EUROPA; break; case 3: - LicenseServer = LICENSE_SERVER_URL_CALLISTO ; + LicenseServer = LICENSE_SERVER_URL_CALLISTO; break; } - return await client.PostAsync($"{LicenseServer}{AppendToLicenseUrl}", content); + return await client.PostAsync($"{LicenseServer}{LicenseUrlParameters}", content); } - catch(System.Net.Http.HttpRequestException){ - if(x==3) + catch (System.Net.Http.HttpRequestException) + { + if (x == 3) throw; } } - return null; + return null; }