From 5e41a8360c45513ac78e069dce938eabda9d6014 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 11 Aug 2020 19:24:13 +0000 Subject: [PATCH] --- dist/win-x64/start.bat | 5 +++-- server/AyaNova/Startup.cs | 2 +- server/AyaNova/util/DbUtil.cs | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dist/win-x64/start.bat b/dist/win-x64/start.bat index 0ee0c24b..bf313d37 100644 --- a/dist/win-x64/start.bat +++ b/dist/win-x64/start.bat @@ -1,4 +1,5 @@ -start .\PostgreSQLPortable_12.1\PostgreSQLPortable.exe +start "PostgreSQLServer" /MAX .\PostgreSQLPortable_12.1\PostgreSQLPortable.exe cd .\files -start ayanova.exe --AYANOVA_DB_CONNECTION="Server=localhost;Username=postgres;Password=raven;Database=AyaNova;" --AYANOVA_DEFAULT_TRANSLATION="en" --AYANOVA_USE_URLS="http://*:7575;" --AYANOVA_BACKUP_PG_DUMP_PATH=".\PostgreSQLPortable\App\PgSQL\bin\" --AYANOVA_FOLDER_USER_FILES= ".\data\userfiles" --AYANOVA_FOLDER_BACKUP_FILES=".\data\backupfiles" +start "AyaNova Server" /MAX ayanova.exe --AYANOVA_DB_CONNECTION="Server=localhost;Username=postgres;Password=mypasswordforpostgres;Database=AyaNova;" --AYANOVA_DEFAULT_TRANSLATION="en" --AYANOVA_USE_URLS="http://*:7575;" --AYANOVA_BACKUP_PG_DUMP_PATH=".\PostgreSQLPortable\App\PgSQL\bin\" --AYANOVA_FOLDER_USER_FILES= ".\data\userfiles" --AYANOVA_FOLDER_BACKUP_FILES=".\data\backupfiles" +timeout 10 start "" http://localhost:7575/api/v8/ \ No newline at end of file diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index 8467a181..0b49a5b4 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -129,7 +129,7 @@ namespace AyaNova DbUtil.ParseConnectionString(_newLog, _connectionString); //Probe for database server - //Will retry every 10 seconds for up to 5 minutes before bailing + //Will retry every 5 seconds for up to 5 minutes before bailing if (!DbUtil.DatabaseServerExists(_newLog, "Waiting for db server ")) { var err = $"E1000 - AyaNova can't connect to the database server after trying for 5 minutes (connection string is:\"{DbUtil.DisplayableConnectionString}\")"; diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs index 6f409552..8f8aa7d7 100644 --- a/server/AyaNova/util/DbUtil.cs +++ b/server/AyaNova/util/DbUtil.cs @@ -128,10 +128,10 @@ namespace AyaNova.Util try { - //Try every 10 seconds for 30 tries before giving up (5 minutes total) + //Try every 5 seconds for 60 tries before giving up (5 minutes total) - var maxRetryAttempts = 30; - var pauseBetweenFailures = TimeSpan.FromSeconds(10); + var maxRetryAttempts = 60; + var pauseBetweenFailures = TimeSpan.FromSeconds(5); RetryHelper.RetryOnException(maxRetryAttempts, pauseBetweenFailures, log, logPrepend + DisplayableConnectionString, () => { using (var conn = new Npgsql.NpgsqlConnection(AdminConnectionString))