admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-11-17 20:02:51 +00:00
parent 890104e9f3
commit 7d9a5878af
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/util/AyaNovaVersion.cs
View File

@@ -5,7 +5,7 @@ namespace AyaNova.Util
/// </summary> /// </summary>
internal static class AyaNovaVersion 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; public const string FullNameAndVersion = "AyaNova server " + VersionString;
}//eoc }//eoc
}//eons }//eons

20
server/AyaNova/util/License.cs
View File

@@ -507,15 +507,12 @@ namespace AyaNova.Core
log.LogInformation($"Fetching license for DBID {LicenseDbId}"); log.LogInformation($"Fetching license for DBID {LicenseDbId}");
var FetchRequest = new dtoFetchRequest() { DbId = LicenseDbId }; var FetchRequest = new dtoFetchRequest() { DbId = LicenseDbId };
string AppendToLicenseUrl=string.Empty; string LicenseUrlParameter = "rvf";
#if (DEBUG) #if (DEBUG)
AppendToLicenseUrl = "rvf";
if (devTestTrial) 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 #endif
try try
@@ -524,7 +521,7 @@ namespace AyaNova.Core
var client = ServiceProviderProvider.HttpClientFactory.CreateClient(); var client = ServiceProviderProvider.HttpClientFactory.CreateClient();
HttpResponseMessage res = null; HttpResponseMessage res = null;
res = await DoFetchAsync(AppendToLicenseUrl, content, client); res = await DoFetchAsync(LicenseUrlParameter, content, client);
if (res.IsSuccessStatusCode) if (res.IsSuccessStatusCode)
{ {
var responseText = await res.Content.ReadAsStringAsync(); var responseText = await res.Content.ReadAsStringAsync();
@@ -592,7 +589,7 @@ namespace AyaNova.Core
} }
} }
private static async Task<HttpResponseMessage> DoFetchAsync(string AppendToLicenseUrl, StringContent content, HttpClient client) private static async Task<HttpResponseMessage> DoFetchAsync(string LicenseUrlParameters, StringContent content, HttpClient client)
{ {
var LicenseServer = string.Empty; var LicenseServer = string.Empty;
for (int x = 0; x < 4; x++) for (int x = 0; x < 4; x++)
@@ -611,15 +608,16 @@ namespace AyaNova.Core
LicenseServer = LICENSE_SERVER_URL_EUROPA; LicenseServer = LICENSE_SERVER_URL_EUROPA;
break; break;
case 3: case 3:
LicenseServer = LICENSE_SERVER_URL_CALLISTO ; LicenseServer = LICENSE_SERVER_URL_CALLISTO;
break; break;
} }
return await client.PostAsync($"{LicenseServer}{AppendToLicenseUrl}", content); return await client.PostAsync($"{LicenseServer}{LicenseUrlParameters}", content);
} }
catch(System.Net.Http.HttpRequestException){ catch (System.Net.Http.HttpRequestException)
if(x==3) {
if (x == 3)
throw; throw;
} }
} }