From e1d98d3c2b50cdfb1eb3810341da28b5830cf70f Mon Sep 17 00:00:00 2001 From: Dominion Date: Tue, 13 Jun 2023 21:43:31 -0400 Subject: [PATCH 1/2] Wait 10 minutes before timing out DB in GitHub Actions --- tests/Tgstation.Server.Tests/Live/TestLiveServer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs index 32f3dcdca4..4e53bc70b5 100644 --- a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs +++ b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs @@ -129,14 +129,14 @@ namespace Tgstation.Server.Tests.Live var connectionFactory = new DatabaseConnectionFactory(); - using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1)); + using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(LiveTestUtils.RunningInGitHubActions ? 10 : 1)); var cancellationToken = cts.Token; try { while (true) { - using var connection = connectionFactory.CreateConnection(connectionString, databaseType); + await using var connection = connectionFactory.CreateConnection(connectionString, databaseType); try { await connection.OpenAsync(cancellationToken); From 3737277b00214e40ed105dee80be7a89757b7292 Mon Sep 17 00:00:00 2001 From: Dominion Date: Tue, 13 Jun 2023 18:25:26 -0400 Subject: [PATCH 2/2] Fix VS lints --- src/Tgstation.Server.Host/Database/DatabaseContext.cs | 8 +++----- src/Tgstation.Server.Host/Database/DatabaseSeeder.cs | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Tgstation.Server.Host/Database/DatabaseContext.cs b/src/Tgstation.Server.Host/Database/DatabaseContext.cs index bf77cbd332..5d1aa3eab7 100644 --- a/src/Tgstation.Server.Host/Database/DatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/DatabaseContext.cs @@ -245,10 +245,8 @@ namespace Tgstation.Server.Host.Database const string ConfigureMethodName = nameof(SqlServerDatabaseContext.ConfigureWith); var configureFunction = typeof(TDatabaseContext).GetMethod( ConfigureMethodName, - BindingFlags.Public | BindingFlags.Static); - - if (configureFunction == null) - throw new InvalidOperationException($"Context type {typeof(TDatabaseContext).FullName} missing static {ConfigureMethodName} function!"); + BindingFlags.Public | BindingFlags.Static) + ?? throw new InvalidOperationException($"Context type {typeof(TDatabaseContext).FullName} missing static {ConfigureMethodName} function!"); return (optionsBuilder, config) => configureFunction.Invoke(null, new object[] { optionsBuilder, config }); } @@ -550,7 +548,7 @@ namespace Tgstation.Server.Host.Database var dbServiceProvider = ((IInfrastructure)Database).Instance; var migrator = dbServiceProvider.GetRequiredService(); - logger.LogInformation("Migrating down to version {0}. Target: {1}", targetVersion, targetMigration); + logger.LogInformation("Migrating down to version {targetVersion}. Target: {targetMigration}", targetVersion, targetMigration); try { await migrator.MigrateAsync(targetMigration, cancellationToken); diff --git a/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs b/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs index 66e74968e0..ab726a2c1b 100644 --- a/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs +++ b/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs @@ -260,7 +260,7 @@ namespace Tgstation.Server.Host.Database if (rowsUpdated > 0) logger.LogInformation( - "Updated {0} instances to use database backed BYOND topic timeouts from configuration setting of {1}", + "Updated {count} instances to use database backed BYOND topic timeouts from configuration setting of {timeout}", rowsUpdated, generalConfiguration.ByondTopicTimeout); }