nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

cleanup installer. break apart update script

Browse Source
This commit is contained in:
Kyle Spearrin
2018-07-19 16:01:54 -04:00
parent 0e7ceed68f
commit 266fc579f2
5 changed files with 13 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
util/Setup/Program.cs
View File

@ -189,9 +189,6 @@ namespace Bit.Setup
};
environmentFileBuilder.BuildForInstaller();
var appSettingsBuilder = new AppSettingsBuilder();
appSettingsBuilder.Build();
var appIdBuilder = new AppIdBuilder(url);
appIdBuilder.Build();
@ -255,7 +252,7 @@ namespace Bit.Setup
.JournalToSqlTable("dbo", "Migration")
.WithScriptsAndCodeEmbeddedInAssembly(Assembly.GetExecutingAssembly(),
s => s.Contains($".DbScripts.") && !s.Contains(".Archive."))
.WithTransaction()
.WithTransactionPerScript()
.WithExecutionTimeout(new TimeSpan(0, 5, 0))
.LogToConsole()
.Build();
@ -272,7 +269,7 @@ namespace Bit.Setup
}
catch(SqlException e)
{
if(e.Message.Contains("Server is in script upgrade mode") && attempt < 3)
if(e.Message.Contains("Server is in script upgrade mode") && attempt < 10)
{
var nextAttempt = attempt + 1;
Console.WriteLine("Database is in script upgrade mode. " +
@ -351,9 +348,6 @@ namespace Bit.Setup
var nginxBuilder = new NginxConfigBuilder(domain, url);
nginxBuilder.BuildForUpdater();
var appSettingsBuilder = new AppSettingsBuilder();
appSettingsBuilder.Build();
var appIdBuilder = new AppIdBuilder(url);
appIdBuilder.Build();