From eb52e9ca5e1543ebf5f82d1e8debd873dd4dbb20 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 11 Aug 2020 23:49:50 +0000 Subject: [PATCH] --- dist/win-x64/aystart.bat | 37 +++++++++++++++++-------------------- server/AyaNova/Startup.cs | 1 + 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dist/win-x64/aystart.bat b/dist/win-x64/aystart.bat index b44bd9df..68c5de7e 100644 --- a/dist/win-x64/aystart.bat +++ b/dist/win-x64/aystart.bat @@ -1,26 +1,23 @@ -@ECHO ON -@setlocal -@SET PATH="%~dp0postgres\bin";%PATH% -@SET PGDATA=%~dp0data\database -@SET PGDATABASE=AyaNova -@SET PGUSER=postgres -@SET PGPORT=5432 -@SET PGLOCALEDIR=%~dp0postgres\share\locale -@set AYANOVA_USE_URLS=http://*:7575; -@set AYANOVA_DB_CONNECTION=Server=localhost;Username=postgres;Password=mypasswordforpostgres;Database=AyaNova; -@set AYANOVA_DEFAULT_TRANSLATION=en -@set AYANOVA_BACKUP_PG_DUMP_PATH=%~dp0postgres\bin\ -@set AYANOVA_FOLDER_USER_FILES=%~dp0data\userfiles -@set AYANOVA_FOLDER_BACKUP_FILES=%~dp0data\backupfiles -@set AYANOVA_LOG_PATH=%~dp0data\ -set -pause +@ECHO OFF +setlocal +SET PATH="%~dp0postgres\bin";%PATH% +SET PGDATA=%~dp0data\database +SET PGDATABASE=AyaNova +SET PGUSER=postgres +SET PGPORT=5432 +SET PGLOCALEDIR=%~dp0postgres\share\locale +set AYANOVA_USE_URLS=http://*:7575; +set AYANOVA_DB_CONNECTION=Server=localhost;Username=postgres;Password=mypasswordforpostgres;Database=AyaNova; +set AYANOVA_DEFAULT_TRANSLATION=en +set AYANOVA_BACKUP_PG_DUMP_PATH=%~dp0postgres\bin\ +set AYANOVA_FOLDER_USER_FILES=%~dp0data\userfiles +set AYANOVA_FOLDER_BACKUP_FILES=%~dp0data\backupfiles +set AYANOVA_LOG_PATH=%~dp0data\ "%~dp0\postgres\bin\pg_ctl" -D "%~dp0/data/database" -l %~dp0data\logs\postgreslog start cd .\ayanova start "AyaNova Server" /MAX ayanova.exe start "" http://localhost:7575/api/v8/ -ECHO "Click enter to stop POSTGRES" -pause +ECHO "Press any key to stop POSTGRES database server" pause "%~dp0\postgres\bin\pg_ctl" -D "%~dp0/data/database" stop -@endlocal \ No newline at end of file +endlocal \ No newline at end of file diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index f7e566af..1d928ebc 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -633,6 +633,7 @@ namespace AyaNova //flag in console that server is open Console.WriteLine("BOOT: COMPLETED - SERVER IS NOW OPEN"); + Console.WriteLine("(ctrl-c to stop AyaNova server)"); }