From 6cce89dbf412a760e6eeb9044a85f7ea5c666360 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 17 Feb 2023 02:15:09 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/util/License.cs | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b93e6d65..5f678d52 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -63,7 +63,7 @@ "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=300;", "AYANOVA_DATA_PATH": "c:\\temp\\ravendata", "AYANOVA_USE_URLS": "http://*:7575;", - //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", + "AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", //"AYANOVA_REMOVE_LICENSE_FROM_DB":"true", //"AYANOVA_REPORT_RENDERING_TIMEOUT":"1", //"AYANOVA_REPORT_RENDER_API_URL_OVERRIDE": "http://localhost:7575", diff --git a/server/AyaNova/util/License.cs b/server/AyaNova/util/License.cs index 0e9642d6..d382c299 100644 --- a/server/AyaNova/util/License.cs +++ b/server/AyaNova/util/License.cs @@ -1,4 +1,4 @@ -//#define DEVELOPMENT_TEST_ROCKFISH +//#define DEVELOPMENT_TEST_SOCKEYE using System; using System.Text; using System.Threading.Tasks; @@ -34,16 +34,18 @@ namespace AyaNova.Core //License server addresses // private const string LICENSE_SERVER_URL_ROCKFISH = "https://rockfish.ayanova.com/"; -#if (DEVELOPMENT_TEST_ROCKFISH) - private const string LICENSE_SERVER_URL_ROCKFISH = "http://localhost:3001/"; -#warning FYI DEVELOPMENT_TEST_ROCKFISH is defined +#if (DEVELOPMENT_TEST_SOCKEYE) + // private const string LICENSE_SERVER_URL_ROCKFISH = "http://localhost:3001/"; + // private const string LICENSE_SERVER_URL_ROCKFISH = "https://sockeye.ayanova.com/"; + private const string LICENSE_SERVER_URL_ROCKFISH = "http://localhost:7676/"; +#warning FYI DEVELOPMENT_TEST_SOCKEYE is defined #else private const string LICENSE_SERVER_URL_ROCKFISH = "https://rockfish.ayanova.com/"; #endif //CRITICAL PROBLEM IF THIS IS TRUE -#if (DEVELOPMENT_TEST_ROCKFISH && !DEBUG) -#error ### HOLDUP: DEVELOPMENT_TEST_ROCKFISH is defined in a RELEASE BUILD!!!! +#if (DEVELOPMENT_TEST_SOCKEYE && !DEBUG) +#error ### HOLDUP: DEVELOPMENT_TEST_SOCKEYE is defined in a RELEASE BUILD!!!! #endif