diff --git a/src/Tgstation.Server.Host/Database/DatabaseContext.cs b/src/Tgstation.Server.Host/Database/DatabaseContext.cs index 7309d6e639..f1351afb2f 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 }); } @@ -555,7 +553,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 00188bfd7f..d757da21d2 100644 --- a/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs +++ b/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs @@ -257,7 +257,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); } diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs index 01f382b083..b24538b125 100644 --- a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs +++ b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs @@ -132,14 +132,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);