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-26 19:46:32 +00:00
parent 1fd940a1da
commit 590e0a1b58
5 changed files with 91 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
.vscode/launch.json vendored
View File

@@ -38,28 +38,28 @@
// "command": "xdg-open" // "command": "xdg-open"
// } // }
// }, // },
"env": { "env": {
"ASPNETCORE_ENVIRONMENT": "Development", // "ASPNETCORE_ENVIRONMENT": "Development",
"AYANOVA_JWT_SECRET": "UNLICENSED5G*QQJ8#bQ7$Xr_@sXfHq4", // "AYANOVA_JWT_SECRET": "UNLICENSED5G*QQJ8#bQ7$Xr_@sXfHq4",
//"AYANOVA_SET_SUPERUSER_PW": "l3tm3in", // //"AYANOVA_SET_SUPERUSER_PW": "l3tm3in",
"AYANOVA_LOG_LEVEL": "Info", // "AYANOVA_LOG_LEVEL": "Info",
//"AYANOVA_LOG_LEVEL": "Debug", // //"AYANOVA_LOG_LEVEL": "Debug",
// "AYANOVA_LOG_LEVEL": "Trace", // // "AYANOVA_LOG_LEVEL": "Trace",
"AYANOVA_DEFAULT_TRANSLATION": "en", // "AYANOVA_DEFAULT_TRANSLATION": "en",
//"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", // //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true",
"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;", "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;",
//"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=abraxis;Database=AyaNova;CommandTimeout=120;", // //"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=abraxis;Database=AyaNova;CommandTimeout=120;",
"AYANOVA_USE_URLS": "http://*:7575;", // "AYANOVA_USE_URLS": "http://*:7575;",
//"AYANOVA_REPORT_RENDERING_TIMEOUT": "20000", // //"AYANOVA_REPORT_RENDERING_TIMEOUT": "20000",
//"AYANOVA_REPORT_RENDERING_MAX_INSTANCES": "3", // //"AYANOVA_REPORT_RENDERING_MAX_INSTANCES": "3",
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", // "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", // "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", // "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
"AYANOVA_SERVER_TEST_MODE": "false", // "AYANOVA_SERVER_TEST_MODE": "false",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", // "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8", // "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin\\" // "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin\\"
}, },
"sourceFileMap": { "sourceFileMap": {
"/Views": "${workspaceFolder}/Views" "/Views": "${workspaceFolder}/Views"
} }

2
buildWinX64SelfContainedRelease.bat
View File

@@ -14,7 +14,7 @@ dotnet publish -c Release -o C:\data\code\raven\dist\win-x64\ayanova\ -r win-x6
rmdir C:\data\code\raven\dist\win-x64\launcher /s/q rmdir C:\data\code\raven\dist\win-x64\launcher /s/q
mkdir C:\data\code\raven\dist\win-x64\launcher mkdir C:\data\code\raven\dist\win-x64\launcher
cd C:\data\code\raven-launcher\ cd C:\data\code\raven-launcher\
dotnet publish -c Release -o C:\data\code\raven\dist\win-x64\launcher\ -r win-x64 --no-self-contained dotnet publish -c Release -o C:\data\code\raven\dist\win-x64\launcher\ -r win-x64 --self-contained

16
dist/install/windows-pg-standalone/ayanovaserver.iss vendored
View File

@@ -2,7 +2,7 @@
; single user or lan only, built in postgres ; single user or lan only, built in postgres
; external to lan requires different config ; external to lan requires different config
#define MyAppName "AyaNova (single user)" #define MyAppName "AyaNova"
#define MyAppVersion "8.0" #define MyAppVersion "8.0"
#define MyAppPublisher "Ground Zero Tech-Works, Inc." #define MyAppPublisher "Ground Zero Tech-Works, Inc."
#define MyAppURL "https://ayanova.com/" #define MyAppURL "https://ayanova.com/"
@@ -47,16 +47,16 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
[Files] [Files]
Source: "C:\data\code\raven\dist\win-x64\ayanova\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion Source: "C:\data\code\raven\dist\win-x64\ayanova\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\data\code\raven\dist\win-x64\ayanova\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "C:\data\code\raven\dist\win-x64\ayanova\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\data\code\raven\dist\win-x64\launcher\appsettings.json"; DestDir: "{app}"; Flags: ignoreversion Source: "C:\data\code\raven\dist\win-x64\launcher\appsettings.json"; DestDir: "{app}"; Flags: ignoreversion confirmoverwrite
Source: "C:\data\code\raven\dist\win-x64\launcher\ayanova-launcher.deps.json"; DestDir: "{app}"; Flags: ignoreversion Source: "C:\data\code\raven\dist\win-x64\launcher\*"; DestDir: "{app}\launcher"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\data\code\raven\dist\win-x64\launcher\ayanova-launcher.dll"; DestDir: "{app}"; Flags: ignoreversion ;Source: "C:\data\code\raven\dist\win-x64\launcher\{#MyAppLauncherExeName}"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\data\code\raven\dist\win-x64\launcher\{#MyAppLauncherExeName}"; DestDir: "{app}"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons] [Icons]
Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppLauncherExeName}";IconFilename: "{app}\logo.ico" Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\launcher\{#MyAppLauncherExeName}";
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppLauncherExeName}"; Tasks: desktopicon ;IconFilename: "{app}\logo.ico"
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\launcher\{#MyAppLauncherExeName}"; Tasks: desktopicon
[Run] [Run]
Filename: "{app}\{#MyAppLauncherExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent Filename: "{app}\launcher\{#MyAppLauncherExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

74
server/AyaNova/Program.cs
View File

@@ -20,16 +20,70 @@ namespace AyaNova
public static void Main(string[] args) public static void Main(string[] args)
{ {
//https://github.com/npgsql/efcore.pg/issues/2045 //https://github.com/npgsql/efcore.pg/issues/2045
//https://www.npgsql.org/efcore/release-notes/6.0.html#breaking-changes //https://www.npgsql.org/efcore/release-notes/6.0.html#breaking-changes
//AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); //AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
//first output
Console.WriteLine($"AYANOVA SERVER {AyaNovaVersion.VersionString} BOOTING ...");
//Boot lock for generator //Boot lock for generator
ServerGlobalOpsSettingsCache.BOOTING = true; ServerGlobalOpsSettingsCache.BOOTING = true;
//Get config //Get config
var config = new ConfigurationBuilder().AddEnvironmentVariables().AddCommandLine(args).Build(); var config = new ConfigurationBuilder().AddJsonFile("config.json", true).AddEnvironmentVariables().AddCommandLine(args).Build();
//Ensure we have critical config values set, if not need to bail with clear message
bool HaveAllCrticalConfigValues = true;
ServerBootConfig.SetConfiguration(config); ServerBootConfig.SetConfiguration(config);
if (string.IsNullOrWhiteSpace(ServerBootConfig.AYANOVA_DB_CONNECTION))
{
Console.WriteLine($"FAIL: AYANOVA_DB_CONNECTION configuration setting missing and required");
HaveAllCrticalConfigValues = false;
}
if (string.IsNullOrWhiteSpace(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES))
{
Console.WriteLine($"FAIL: AYANOVA_FOLDER_BACKUP_FILES configuration setting missing and required");
HaveAllCrticalConfigValues = false;
}
if (string.IsNullOrWhiteSpace(ServerBootConfig.AYANOVA_FOLDER_USER_FILES))
{
Console.WriteLine($"FAIL: AYANOVA_FOLDER_USER_FILES configuration setting missing and required");
HaveAllCrticalConfigValues = false;
}
if (string.IsNullOrWhiteSpace(ServerBootConfig.AYANOVA_FOLDER_TEMPORARY_SERVER_FILES))
{
Console.WriteLine($"FAIL: AYANOVA_FOLDER_TEMPORARY_SERVER_FILES configuration setting missing and required");
HaveAllCrticalConfigValues = false;
}
if (!HaveAllCrticalConfigValues)
{
Console.WriteLine($"Required configuration settings missing; server can not be started");
return;
}
// "AYANOVA_FOLDER_USER_FILES":"%programdata\\ayanova\\userfiles",
// "":"%programdata\\ayanova\\backupfiles",
// "AYANOVA_LOG_LEVEL": "Info",
// "AYANOVA_LOG_PATH":"%programdata\\ayanova\\"
//Human readable config output to console for diagnosis in case server wont' start
var AyaNovaConfig = config.AsEnumerable().Where(z => z.Key.StartsWith("AYANOVA") && z.Key != "AYANOVA_JWT_SECRET" && z.Key != "AYANOVA_SET_SUPERUSER_PW").Select(z => z.Key + "=" + z.Value).ToList();
var DiagConfig = string.Join(",", AyaNovaConfig);
DiagConfig = DbUtil.PasswordRedactedConnectionString(DiagConfig);
Console.WriteLine($"Config {DiagConfig}");
@@ -163,20 +217,10 @@ namespace AyaNova
//This is the first log entry //This is the first log entry
logger.Info($"AYANOVA SERVER {AyaNovaVersion.VersionString} BOOTING"); logger.Info($"AYANOVA SERVER {AyaNovaVersion.VersionString} BOOTING");
Console.WriteLine($"AYANOVA SERVER {AyaNovaVersion.VersionString} BOOTING ...");
//log configuration //log configuration
try logger.Info($"Config {DiagConfig}");
{
var AyaNovaConfig = config.AsEnumerable().Where(z => z.Key.StartsWith("AYANOVA") && z.Key != "AYANOVA_JWT_SECRET" && z.Key != "AYANOVA_SET_SUPERUSER_PW").Select(z => z.Key + "=" + z.Value).ToList();
var DiagConfig = string.Join(",", AyaNovaConfig);
DiagConfig = DbUtil.PasswordRedactedConnectionString(DiagConfig);
logger.Info($"Config {DiagConfig}");
}
catch (Exception ex)
{
logger.Error(ex, "Error fetching configuration");
}
logger.Debug($"Full configuration is {config.GetDebugView()}"); logger.Debug($"Full configuration is {config.GetDebugView()}");
if (ServerBootConfig.AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG) if (ServerBootConfig.AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG)

1
server/AyaNova/util/ServerBootConfig.cs
View File

@@ -183,6 +183,7 @@ namespace AyaNova.Util
//Log folder //Log folder
AYANOVA_LOG_PATH = config.GetValue<string>("AYANOVA_LOG_PATH"); AYANOVA_LOG_PATH = config.GetValue<string>("AYANOVA_LOG_PATH");
if (AYANOVA_LOG_PATH == null) if (AYANOVA_LOG_PATH == null)
{ {
//DEFAULT LOG PATH //DEFAULT LOG PATH