diff --git a/.travis.yml b/.travis.yml index 25cb4a535a..b5de2be669 100644 --- a/.travis.yml +++ b/.travis.yml @@ -102,6 +102,14 @@ jobs: name: "Docker Build" services: - docker + - env: + - DoxGeneration=true + name: "Dox Generation" + addons: + apt: + packages: + - doxygen + - graphviz - env: - DoxGeneration=false - DockerBuild=false @@ -118,14 +126,6 @@ jobs: packages: - libc6-i386 - libstdc++6:i386 - - env: - - DoxGeneration=true - name: "Dox Generation" - addons: - apt: - packages: - - doxygen - - graphviz install: - if [ $DoxGeneration = false ] && [ $DockerBuild = false ] && [ $DMAPI = true ]; then build/install_byond.sh; fi diff --git a/appveyor.yml b/appveyor.yml index 3ba2f056f9..13d2da0ad0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -73,7 +73,7 @@ test_script: - OpenCover.Console.exe -returntargetcode -register:user -target:"C:/Program Files/dotnet/dotnet.exe" -targetargs:"test -c %CONFIGURATION% --logger:trx;LogFileName=results.trx /p:DebugType=full tests/Tgstation.Server.Host.Watchdog.Tests/Tgstation.Server.Host.Watchdog.Tests.csproj" -filter:"+[Tgstation.Server*]* -[Tgstation.Server.Host.Watchdog.Tests*]*" -output:".\watchdog_coverage.xml" -oldstyle - ps: $wc = New-Object 'System.Net.WebClient' - ps: $wc.UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\tests\Tgstation.Server.Host.Watchdog.Tests\TestResults\results.trx)) - - OpenCover.Console.exe -returntargetcode -register:user -target:"C:/Program Files/dotnet/dotnet.exe" -targetargs:"test -c %CONFIGURATION% --logger:trx;LogFileName=results.trx /p:DebugType=full tests/Tgstation.Server.Tests/Tgstation.Server.Tests.csproj" -filter:"+[Tgstation.Server*]* -[Tgstation.Server.Tests*]* -[Tgstation.Server.Host]Tgstation.Server.Host.Database.Migrations..*" -output:".\server_coverage.xml" -oldstyle + - OpenCover.Console.exe -returntargetcode -register:user -target:"C:/Program Files/dotnet/dotnet.exe" -targetargs:"test -c %CONFIGURATION% --logger:trx;LogFileName=results.trx --logger:console;noprogress=true /p:DebugType=full tests/Tgstation.Server.Tests/Tgstation.Server.Tests.csproj" -filter:"+[Tgstation.Server*]* -[Tgstation.Server.Tests*]* -[Tgstation.Server.Host]Tgstation.Server.Host.Database.Migrations..*" -output:".\server_coverage.xml" -oldstyle - ps: $wc = New-Object 'System.Net.WebClient' - ps: $wc.UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\tests\Tgstation.Server.Tests\TestResults\results.trx)) - lint-openapi -p -c build/OpenApiValidationSettings.json C:/swagger.json diff --git a/build/Version.props b/build/Version.props index a5d010ffb8..bda24b2315 100644 --- a/build/Version.props +++ b/build/Version.props @@ -5,7 +5,7 @@ 4.3.0 6.5.0 7.1.0 - 5.2.1 + 5.2.2 0.4.0 1.1.0 diff --git a/build/integration_test.sh b/build/integration_test.sh index 55b7b792e4..8492301359 100755 --- a/build/integration_test.sh +++ b/build/integration_test.sh @@ -10,7 +10,7 @@ cd tests/Tgstation.Server.Tests dotnet build -c $CONFIG -$HOME/.dotnet/tools/coverlet bin/$CONFIG/netcoreapp3.1/Tgstation.Server.Tests.dll --target "dotnet" --targetargs "test -c $CONFIG --no-build" --format opencover --output "../../TestResults/integration_test.xml" --include "[Tgstation.Server*]*" --exclude "[Tgstation.Server.Tests*]*" --exclude "[Tgstation.Server.Host]Tgstation.Server.Host.Database.Migrations.*" +$HOME/.dotnet/tools/coverlet bin/$CONFIG/netcoreapp3.1/Tgstation.Server.Tests.dll --target "dotnet" --targetargs "test -c $CONFIG --no-build --logger:\"console;noprogress=true\"" --format opencover --output "../../TestResults/integration_test.xml" --include "[Tgstation.Server*]*" --exclude "[Tgstation.Server.Tests*]*" --exclude "[Tgstation.Server.Host]Tgstation.Server.Host.Database.Migrations.*" cd ../../TestResults diff --git a/src/DMAPI/tgs.dm b/src/DMAPI/tgs.dm index 7c0811ec59..4493aef72c 100644 --- a/src/DMAPI/tgs.dm +++ b/src/DMAPI/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "5.2.1" +#define TGS_DMAPI_VERSION "5.2.2" // All functions and datums outside this document are subject to change with any version and should not be relied on. @@ -127,6 +127,7 @@ * Call this when your initializations are complete and your game is ready to play before any player interactions happen. * * This may use [/world/var/sleep_offline] to make this happen so ensure no changes are made to it while this call is running. + * Afterwards, consider explicitly setting it to what you want to avoid this BYOND bug: http://www.byond.com/forum/post/2575184 * Before this point, note that any static files or directories may be in use by another server. Your code should account for this. * This function should not be called before ..() in [/world/proc/New]. */ diff --git a/src/DMAPI/tgs/v4/api.dm b/src/DMAPI/tgs/v4/api.dm index 1dc98f811e..5e7f3c60be 100644 --- a/src/DMAPI/tgs/v4/api.dm +++ b/src/DMAPI/tgs/v4/api.dm @@ -114,12 +114,14 @@ /datum/tgs_api/v4/OnInitializationComplete() Export(TGS4_COMM_SERVER_PRIMED) - var/tgs4_secret_sleep_offline_sauce = 24051994 + var/tgs4_secret_sleep_offline_sauce = 29051994 var/old_sleep_offline = world.sleep_offline world.sleep_offline = tgs4_secret_sleep_offline_sauce sleep(1) if(world.sleep_offline == tgs4_secret_sleep_offline_sauce) //if not someone changed it world.sleep_offline = old_sleep_offline + else + TGS_WARNING_LOG("world.sleep_offline unexpectedly changed!") /datum/tgs_api/v4/OnTopic(T) var/list/params = params2list(T) diff --git a/src/DMAPI/tgs/v5/api.dm b/src/DMAPI/tgs/v5/api.dm index 8ca85faf05..3791cbde84 100644 --- a/src/DMAPI/tgs/v5/api.dm +++ b/src/DMAPI/tgs/v5/api.dm @@ -16,7 +16,7 @@ var/list/chat_channels /datum/tgs_api/v5/ApiVersion() - return new /datum/tgs_version("5.2.1") + return new /datum/tgs_version("5.2.2") /datum/tgs_api/v5/OnWorldNew(minimum_required_security_level) server_port = world.params[DMAPI5_PARAM_SERVER_PORT] @@ -94,6 +94,8 @@ sleep(1) if(world.sleep_offline == tgs4_secret_sleep_offline_sauce) //if not someone changed it world.sleep_offline = old_sleep_offline + else + TGS_WARNING_LOG("world.sleep_offline unexpectedly changed!") /datum/tgs_api/v5/proc/TopicResponse(error_message = null) var/list/response = list() diff --git a/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs b/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs index 125938305b..d91d5bdbf7 100644 --- a/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs +++ b/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs @@ -33,7 +33,7 @@ namespace Tgstation.Server.Host.Components.Interop /// /// The DMAPI being used. /// - public static readonly Version Version = new Version(5, 2, 1); + public static readonly Version Version = new Version(5, 2, 2); /// /// for use when communicating with the DMAPI. diff --git a/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs index 13c96f350a..e3e8968fd8 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs @@ -192,7 +192,7 @@ namespace Tgstation.Server.Host.Components.Watchdog }; /// - protected override void DisposeAndNullControllers() + protected override void DisposeAndNullControllersImpl() { Server?.Dispose(); Server = null; diff --git a/src/Tgstation.Server.Host/Components/Watchdog/ExperimentalWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/ExperimentalWatchdog.cs index 02daf7d157..6547ef6d62 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/ExperimentalWatchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/ExperimentalWatchdog.cs @@ -392,10 +392,8 @@ namespace Tgstation.Server.Host.Components.Watchdog } #pragma warning restore CA1502 - /// - /// Call on and and set them to - /// - protected override void DisposeAndNullControllers() + /// + protected override void DisposeAndNullControllersImpl() { alphaServer?.Dispose(); alphaServer = null; diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs index fb20b8fc48..d6eafdef32 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs @@ -112,6 +112,11 @@ namespace Tgstation.Server.Host.Components.Watchdog /// readonly IRestartRegistration restartRegistration; + /// + /// used for . + /// + readonly object controllerDisposeLock; + /// /// If the should in /// @@ -201,6 +206,7 @@ namespace Tgstation.Server.Host.Components.Watchdog ActiveLaunchParameters = initialLaunchParameters; releaseServers = false; ActiveParametersUpdated = new TaskCompletionSource(); + controllerDisposeLock = new object(); restartRegistration = serverControl.RegisterForRestart(this); try @@ -463,7 +469,16 @@ namespace Tgstation.Server.Host.Components.Watchdog /// /// Call and null the fields for all s and set to . /// - protected abstract void DisposeAndNullControllers(); + protected abstract void DisposeAndNullControllersImpl(); + + /// + /// Wrapper for under a locked context. + /// + protected void DisposeAndNullControllers() + { + lock (controllerDisposeLock) + DisposeAndNullControllersImpl(); + } /// /// Get the active . diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs index 895347f4a6..730ced06b9 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs @@ -101,9 +101,9 @@ namespace Tgstation.Server.Host.Components.Watchdog } /// - protected override void DisposeAndNullControllers() + protected override void DisposeAndNullControllersImpl() { - base.DisposeAndNullControllers(); + base.DisposeAndNullControllersImpl(); // If we reach this point, we can guarantee PrepServerForLaunch will be called before starting again. activeSwappable = null; diff --git a/src/Tgstation.Server.Host/Configuration/DatabaseConfiguration.cs b/src/Tgstation.Server.Host/Configuration/DatabaseConfiguration.cs index a02f70256e..abe1a6d5df 100644 --- a/src/Tgstation.Server.Host/Configuration/DatabaseConfiguration.cs +++ b/src/Tgstation.Server.Host/Configuration/DatabaseConfiguration.cs @@ -4,7 +4,7 @@ using Newtonsoft.Json.Converters; namespace Tgstation.Server.Host.Configuration { /// - /// Configuration options for the + /// Configuration options for the /// sealed class DatabaseConfiguration { diff --git a/src/Tgstation.Server.Host/Configuration/GeneralConfiguration.cs b/src/Tgstation.Server.Host/Configuration/GeneralConfiguration.cs index e20d5cb3df..39c4ac068c 100644 --- a/src/Tgstation.Server.Host/Configuration/GeneralConfiguration.cs +++ b/src/Tgstation.Server.Host/Configuration/GeneralConfiguration.cs @@ -42,7 +42,7 @@ namespace Tgstation.Server.Host.Configuration /// /// The default value for /// - const int DefaultRestartTimeout = 10000; + const int DefaultRestartTimeout = 60000; /// /// The port the TGS API listens on. diff --git a/src/Tgstation.Server.Host/Controllers/ApiController.cs b/src/Tgstation.Server.Host/Controllers/ApiController.cs index c021746687..a60949643f 100644 --- a/src/Tgstation.Server.Host/Controllers/ApiController.cs +++ b/src/Tgstation.Server.Host/Controllers/ApiController.cs @@ -163,7 +163,7 @@ namespace Tgstation.Server.Host.Controllers if (ApiHeaders != null) Logger.LogDebug( - "Request made by User ID {0}. Api version: {1}. User-Agent: {2}. Type: {3}. Route {4}{5} to Instance {6}", + "Request details: User ID {0}. Api version: {1}. User-Agent: {2}. Type: {3}. Route {4}{5} to Instance {6}", AuthenticationContext?.User.Id.Value.ToString(CultureInfo.InvariantCulture), ApiHeaders.ApiVersion.Semver(), ApiHeaders.RawUserAgent, diff --git a/src/Tgstation.Server.Host/Core/Application.cs b/src/Tgstation.Server.Host/Core/Application.cs index ac58267bc1..c7ed253c9c 100644 --- a/src/Tgstation.Server.Host/Core/Application.cs +++ b/src/Tgstation.Server.Host/Core/Application.cs @@ -202,7 +202,7 @@ namespace Tgstation.Server.Host.Core // CORS conditionally enabled later services.AddCors(); - void AddTypedContext() where TContext : DatabaseContext + void AddTypedContext() where TContext : DatabaseContext { services.AddDbContext(builder => { @@ -357,6 +357,8 @@ namespace Tgstation.Server.Host.Core // Final point where we wrap exceptions in a 500 (ErrorMessage) response applicationBuilder.UseServerErrorHandling(); + applicationBuilder.UseRequestCounting(); + // 503 requests made while the application is starting applicationBuilder.UseAsyncInitialization(async (cancellationToken) => { diff --git a/src/Tgstation.Server.Host/Database/DatabaseContext.cs b/src/Tgstation.Server.Host/Database/DatabaseContext.cs index 82a974a01c..10dddb039d 100644 --- a/src/Tgstation.Server.Host/Database/DatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/DatabaseContext.cs @@ -18,95 +18,94 @@ namespace Tgstation.Server.Host.Database /// /// Backend abstract implementation of /// - /// The child used to implement a backend. #pragma warning disable CA1506 // TODO: Decomplexify - abstract class DatabaseContext : DbContext, IDatabaseContext where TParentContext : DbContext + abstract class DatabaseContext : DbContext, IDatabaseContext { /// public DatabaseType DatabaseType => DatabaseConfiguration.DatabaseType; /// - /// The s in the . + /// The s in the . /// public DbSet Users { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet Instances { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet CompileJobs { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet RevisionInformations { get; set; } /// - /// The in the . + /// The in the . /// public DbSet DreamMakerSettings { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet ChatBots { get; set; } /// - /// The in the . + /// The in the . /// public DbSet DreamDaemonSettings { get; set; } /// - /// The in the . + /// The in the . /// public DbSet RepositorySettings { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet InstanceUsers { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet ChatChannels { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet Jobs { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet ReattachInformations { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet WatchdogReattachInformations { get; set; } /// - /// The s in the + /// The s in the /// public DbSet TestMerges { get; set; } /// - /// The s om the + /// The s om the /// public DbSet RevInfoTestMerges { get; set; } /// - /// The for the + /// The for the /// protected ILogger Logger { get; } /// - /// The for the + /// The for the /// protected DatabaseConfiguration DatabaseConfiguration { get; } @@ -150,7 +149,7 @@ namespace Tgstation.Server.Host.Database IDatabaseCollection IDatabaseContext.WatchdogReattachInformations => watchdogReattachInformationsCollection; /// - /// The for the + /// The for the /// readonly IDatabaseSeeder databaseSeeder; @@ -220,13 +219,13 @@ namespace Tgstation.Server.Host.Database readonly IDatabaseCollection watchdogReattachInformationsCollection; /// - /// Construct a + /// Construct a /// - /// The for the + /// The for the . /// The containing the value of /// The value of /// The value of - public DatabaseContext(DbContextOptions dbContextOptions, IOptions databaseConfigurationOptions, IDatabaseSeeder databaseSeeder, ILogger logger) : base(dbContextOptions) + public DatabaseContext(DbContextOptions dbContextOptions, IOptions databaseConfigurationOptions, IDatabaseSeeder databaseSeeder, ILogger logger) : base(dbContextOptions) { DatabaseConfiguration = databaseConfigurationOptions?.Value ?? throw new ArgumentNullException(nameof(databaseConfigurationOptions)); this.databaseSeeder = databaseSeeder ?? throw new ArgumentNullException(nameof(databaseSeeder)); @@ -410,7 +409,7 @@ namespace Tgstation.Server.Host.Database } /// - /// Ensure the is correct for the . + /// Ensure the is correct for the . /// protected abstract void ValidateDatabaseType(); } diff --git a/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs b/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs index 7d13dfc80d..e7173b0067 100644 --- a/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs +++ b/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs @@ -14,12 +14,12 @@ namespace Tgstation.Server.Host.Database sealed class DatabaseSeeder : IDatabaseSeeder { /// - /// The for the + /// The for the /// readonly ICryptographySuite cryptographySuite; /// - /// The for the . + /// The for the . /// readonly IPlatformIdentifier platformIdentifier; diff --git a/src/Tgstation.Server.Host/Database/Design/DesignTimeDbContextFactoryHelpers.cs b/src/Tgstation.Server.Host/Database/Design/DesignTimeDbContextFactoryHelpers.cs index 9699c86a16..98f71aeaaf 100644 --- a/src/Tgstation.Server.Host/Database/Design/DesignTimeDbContextFactoryHelpers.cs +++ b/src/Tgstation.Server.Host/Database/Design/DesignTimeDbContextFactoryHelpers.cs @@ -4,7 +4,7 @@ using Tgstation.Server.Host.Configuration; namespace Tgstation.Server.Host.Database.Design { /// - /// Contains helpers for creating design time s + /// Contains helpers for creating design time s /// static class DesignTimeDbContextFactoryHelpers { @@ -14,7 +14,7 @@ namespace Tgstation.Server.Host.Database.Design /// The . /// The . /// The for the - public static IOptions GetDbContextOptions(DatabaseType databaseType, string connectionString) + public static IOptions GetDatabaseConfiguration(DatabaseType databaseType, string connectionString) { var dbConfig = new DatabaseConfiguration { diff --git a/src/Tgstation.Server.Host/Database/Design/MySqlDesignTimeDbContextFactory.cs b/src/Tgstation.Server.Host/Database/Design/MySqlDesignTimeDbContextFactory.cs index 61f2cfd8df..5b39d9e63d 100644 --- a/src/Tgstation.Server.Host/Database/Design/MySqlDesignTimeDbContextFactory.cs +++ b/src/Tgstation.Server.Host/Database/Design/MySqlDesignTimeDbContextFactory.cs @@ -20,7 +20,7 @@ namespace Tgstation.Server.Host.Database.Design using var loggerFactory = new LoggerFactory(); return new MySqlDatabaseContext( new DbContextOptions(), - DesignTimeDbContextFactoryHelpers.GetDbContextOptions( + DesignTimeDbContextFactoryHelpers.GetDatabaseConfiguration( DatabaseType.MariaDB, "Server=127.0.0.1;User Id=root;Password=fake;Database=TGS_Design"), new DatabaseSeeder( diff --git a/src/Tgstation.Server.Host/Database/Design/PostgresSqlDesignTimeDbContextFactory.cs b/src/Tgstation.Server.Host/Database/Design/PostgresSqlDesignTimeDbContextFactory.cs index 10963af511..2af7d7c939 100644 --- a/src/Tgstation.Server.Host/Database/Design/PostgresSqlDesignTimeDbContextFactory.cs +++ b/src/Tgstation.Server.Host/Database/Design/PostgresSqlDesignTimeDbContextFactory.cs @@ -18,7 +18,7 @@ namespace Tgstation.Server.Host.Database.Design using var loggerFactory = new LoggerFactory(); return new PostgresSqlDatabaseContext( new DbContextOptions(), - DesignTimeDbContextFactoryHelpers.GetDbContextOptions( + DesignTimeDbContextFactoryHelpers.GetDatabaseConfiguration( DatabaseType.PostgresSql, "Application Name=tgstation-server;Host=127.0.0.1;Password=qCkWimNgLfWwpr7TnUHs;Username=postgres;Database=TGS_Design"), new DatabaseSeeder( diff --git a/src/Tgstation.Server.Host/Database/Design/SqlServerDesignTimeDbContextFactory.cs b/src/Tgstation.Server.Host/Database/Design/SqlServerDesignTimeDbContextFactory.cs index 68cc43ed2f..427d84ba8a 100644 --- a/src/Tgstation.Server.Host/Database/Design/SqlServerDesignTimeDbContextFactory.cs +++ b/src/Tgstation.Server.Host/Database/Design/SqlServerDesignTimeDbContextFactory.cs @@ -20,7 +20,7 @@ namespace Tgstation.Server.Host.Database.Design using var loggerFactory = new LoggerFactory(); return new SqlServerDatabaseContext( new DbContextOptions(), - DesignTimeDbContextFactoryHelpers.GetDbContextOptions( + DesignTimeDbContextFactoryHelpers.GetDatabaseConfiguration( DatabaseType.SqlServer, "Data Source=fake;Initial Catalog=TGS_Design;Integrated Security=True;Application Name=tgstation-server"), new DatabaseSeeder( diff --git a/src/Tgstation.Server.Host/Database/Design/SqliteDesignTimeDbContextFactory.cs b/src/Tgstation.Server.Host/Database/Design/SqliteDesignTimeDbContextFactory.cs index ba5690ec75..91de1284f2 100644 --- a/src/Tgstation.Server.Host/Database/Design/SqliteDesignTimeDbContextFactory.cs +++ b/src/Tgstation.Server.Host/Database/Design/SqliteDesignTimeDbContextFactory.cs @@ -20,7 +20,7 @@ namespace Tgstation.Server.Host.Database.Design using var loggerFactory = new LoggerFactory(); return new SqliteDatabaseContext( new DbContextOptions(), - DesignTimeDbContextFactoryHelpers.GetDbContextOptions( + DesignTimeDbContextFactoryHelpers.GetDatabaseConfiguration( DatabaseType.Sqlite, "Data Source=tgs_design.sqlite3;Mode=ReadWriteCreate"), new DatabaseSeeder( diff --git a/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs b/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs index 009ab4463b..c18d4e723e 100644 --- a/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs @@ -9,17 +9,17 @@ using Tgstation.Server.Host.Configuration; namespace Tgstation.Server.Host.Database { /// - /// for MySQL + /// for MySQL /// - sealed class MySqlDatabaseContext : DatabaseContext + sealed class MySqlDatabaseContext : DatabaseContext { /// /// Construct a /// - /// The for the - /// The of for the - /// The for the - /// The for the + /// The for the + /// The of for the + /// The for the + /// The for the public MySqlDatabaseContext(DbContextOptions dbContextOptions, IOptions databaseConfiguration, IDatabaseSeeder databaseSeeder, ILogger logger) : base(dbContextOptions, databaseConfiguration, databaseSeeder, logger) { } diff --git a/src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs b/src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs index 4042b423ab..111f3918ed 100644 --- a/src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs @@ -8,17 +8,17 @@ using Tgstation.Server.Host.Configuration; namespace Tgstation.Server.Host.Database { /// - /// for PostgresSQL. + /// for PostgresSQL. /// - sealed class PostgresSqlDatabaseContext : DatabaseContext + sealed class PostgresSqlDatabaseContext : DatabaseContext { /// /// Construct a /// - /// The for the - /// The of for the - /// The for the - /// The for the + /// The for the + /// The of for the + /// The for the + /// The for the public PostgresSqlDatabaseContext( DbContextOptions dbContextOptions, IOptions databaseConfiguration, diff --git a/src/Tgstation.Server.Host/Database/SqlServerDatabaseContext.cs b/src/Tgstation.Server.Host/Database/SqlServerDatabaseContext.cs index be2a4b4876..42c6aedc4e 100644 --- a/src/Tgstation.Server.Host/Database/SqlServerDatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/SqlServerDatabaseContext.cs @@ -7,17 +7,17 @@ using Tgstation.Server.Host.Configuration; namespace Tgstation.Server.Host.Database { /// - /// for Sqlserver + /// for Sqlserver /// - sealed class SqlServerDatabaseContext : DatabaseContext + sealed class SqlServerDatabaseContext : DatabaseContext { /// /// Construct a /// - /// The for the - /// The of for the - /// The for the - /// The for the + /// The for the + /// The of for the + /// The for the + /// The for the public SqlServerDatabaseContext(DbContextOptions dbContextOptions, IOptions databaseConfiguration, IDatabaseSeeder databaseSeeder, ILogger logger) : base(dbContextOptions, databaseConfiguration, databaseSeeder, logger) { } diff --git a/src/Tgstation.Server.Host/Database/SqliteDatabaseContext.cs b/src/Tgstation.Server.Host/Database/SqliteDatabaseContext.cs index 2e71317a65..4d9fecf844 100644 --- a/src/Tgstation.Server.Host/Database/SqliteDatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/SqliteDatabaseContext.cs @@ -9,17 +9,17 @@ using Tgstation.Server.Host.Configuration; namespace Tgstation.Server.Host.Database { /// - /// for MySQL + /// for MySQL /// - sealed class SqliteDatabaseContext : DatabaseContext + sealed class SqliteDatabaseContext : DatabaseContext { /// /// Construct a /// - /// The for the - /// The of for the - /// The for the - /// The for the + /// The for the + /// The of for the + /// The for the + /// The for the public SqliteDatabaseContext(DbContextOptions dbContextOptions, IOptions databaseConfiguration, IDatabaseSeeder databaseSeeder, ILogger logger) : base(dbContextOptions, databaseConfiguration, databaseSeeder, logger) { } diff --git a/src/Tgstation.Server.Host/Extensions/ApplicationBuilderExtensions.cs b/src/Tgstation.Server.Host/Extensions/ApplicationBuilderExtensions.cs index f155aff190..2fe00098db 100644 --- a/src/Tgstation.Server.Host/Extensions/ApplicationBuilderExtensions.cs +++ b/src/Tgstation.Server.Host/Extensions/ApplicationBuilderExtensions.cs @@ -107,5 +107,32 @@ namespace Tgstation.Server.Host.Extensions } }); } + + /// + /// Add middleware for logging the request number. + /// + /// The to configure. + public static void UseRequestCounting(this IApplicationBuilder applicationBuilder) + { + if (applicationBuilder == null) + throw new ArgumentNullException(nameof(applicationBuilder)); + + ulong requestCounter = 0; + + applicationBuilder.Use(async (context, next) => + { + var logger = GetLogger(context); + var requestNumber = ++requestCounter; + logger.LogTrace("Starting request #{0}...", requestNumber); + try + { + await next().ConfigureAwait(false); + } + finally + { + logger.LogTrace("Finished request #{0}", requestNumber); + } + }); + } } } diff --git a/src/Tgstation.Server.Host/Server.cs b/src/Tgstation.Server.Host/Server.cs index 5a8fd3ee84..45b824bd39 100644 --- a/src/Tgstation.Server.Host/Server.cs +++ b/src/Tgstation.Server.Host/Server.cs @@ -299,7 +299,10 @@ namespace Tgstation.Server.Host { await eventsTask.ConfigureAwait(false); } - catch (OperationCanceledException) { } + catch (OperationCanceledException) + { + logger.LogError("Restart timeout hit! Existing DreamDaemon processes will be lost and must be killed manually before being restarted with TGS!"); + } catch (Exception e) { logger.LogError("Restart handlers error! Exception: {0}", e); diff --git a/src/Tgstation.Server.Host/appsettings.json b/src/Tgstation.Server.Host/appsettings.json index e7f47e59b1..55786ab050 100644 --- a/src/Tgstation.Server.Host/appsettings.json +++ b/src/Tgstation.Server.Host/appsettings.json @@ -5,7 +5,7 @@ "GitHubAccessToken": null, "SetupWizardMode": "AutoDetect", "ByondTopicTimeout": 5000, - "RestartTimeout": 10000, + "RestartTimeout": 60000, "UseExperimentalWatchdog": false, "UseBasicWatchdogOnWindows": false, "UserLimit": 100, diff --git a/tests/DMAPI/BasicOperation/Test.dm b/tests/DMAPI/BasicOperation/Test.dm index 21ba9e6226..a603a099be 100644 --- a/tests/DMAPI/BasicOperation/Test.dm +++ b/tests/DMAPI/BasicOperation/Test.dm @@ -25,6 +25,10 @@ world.log << "You really shouldn't be able to read this" +/world/Export(url) + log << "Export: [url]" + return ..() + /world/Topic(T, Addr, Master, Keys) world.log << "Topic: [T]" . = HandleTopic(T) diff --git a/tests/DMAPI/LongRunning/Test.dm b/tests/DMAPI/LongRunning/Test.dm index 631dcfccae..8930774de6 100644 --- a/tests/DMAPI/LongRunning/Test.dm +++ b/tests/DMAPI/LongRunning/Test.dm @@ -1,4 +1,8 @@ +/world + sleep_offline = FALSE + /world/New() + log << "Initial value of sleep_offline: [sleep_offline]" TgsNew(new /datum/tgs_event_handler/impl, TGS_SECURITY_ULTRASAFE) StartAsync() @@ -9,17 +13,16 @@ /proc/Run() sleep(60) world.TgsChatBroadcast("World Initialized") - world.TgsInitializationComplete() + // world.TgsInitializationComplete() /world/Topic(T, Addr, Master, Keys) - world.log << "Topic: [T]" + log << "Topic: [T]" . = HandleTopic(T) - world.log << "Response: [.]" + log << "Response: [.]" /world/proc/HandleTopic(T) TGS_TOPIC - world.sleep_offline = FALSE TgsChatBroadcast("Recieved non-tgs topic: [T]") var/list/data = params2list(T) @@ -40,9 +43,14 @@ world.TgsChatBroadcast("Recieved event: [json_encode(args)]") +/world/Export(url) + log << "Export: [url]" + return ..() + /proc/RebootAsync() set waitfor = FALSE - world.sleep_offline = FALSE world.TgsChatBroadcast("Rebooting after 3 seconds"); + world.log << "About to sleep. sleep_offline: [world.sleep_offline]" sleep(30) + world.log << "Done sleep, calling Reboot" world.Reboot() diff --git a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs index f7a8ed3e55..9955bc1af4 100644 --- a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs +++ b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs @@ -29,6 +29,7 @@ namespace Tgstation.Server.Tests.Instance public async Task Run(CancellationToken cancellationToken) { + global::System.Console.WriteLine("TEST: START WATCHDOG TESTS"); // Increase startup timeout, disable heartbeats await instanceClient.DreamDaemon.Update(new DreamDaemon { @@ -46,17 +47,18 @@ namespace Tgstation.Server.Tests.Instance // await RunLongRunningTestThenUpdate(cancellationToken); // await RunLongRunningTestThenUpdateWithByondVersionSwitch(cancellationToken); - // Remove this deploy when the above tests are reenabled await DeployTestDme("LongRunning/long_running_test", DreamDaemonSecurity.Trusted, cancellationToken); await RunHeartbeatTest(cancellationToken); await StartAndLeaveRunning(cancellationToken); + global::System.Console.WriteLine("TEST: END WATCHDOG TESTS"); } async Task RunBasicTest(CancellationToken cancellationToken) { + global::System.Console.WriteLine("TEST: WATCHDOG BASIC TEST"); var daemonStatus = await DeployTestDme("BasicOperation/basic_operation_test", DreamDaemonSecurity.Ultrasafe, cancellationToken); Assert.IsFalse(daemonStatus.Running.Value); @@ -84,6 +86,7 @@ namespace Tgstation.Server.Tests.Instance async Task RunHeartbeatTest(CancellationToken cancellationToken) { + global::System.Console.WriteLine("TEST: WATCHDOG HEARTBEAT TEST"); // enable heartbeats await instanceClient.DreamDaemon.Update(new DreamDaemon { @@ -144,6 +147,7 @@ namespace Tgstation.Server.Tests.Instance async Task RunLongRunningTestThenUpdate(CancellationToken cancellationToken) { + global::System.Console.WriteLine("TEST: WATCHDOG LONG RUNNING TEST"); const string DmeName = "LongRunning/long_running_test"; var daemonStatus = await DeployTestDme(DmeName, DreamDaemonSecurity.Trusted, cancellationToken); @@ -184,6 +188,7 @@ namespace Tgstation.Server.Tests.Instance async Task RunLongRunningTestThenUpdateWithByondVersionSwitch(CancellationToken cancellationToken) { + global::System.Console.WriteLine("TEST: WATCHDOG BYOND VERSION UPDATE TEST"); var versionToInstall = new Version(511, 1384, 0); var byondInstallJobTask = instanceClient.Byond.SetActiveVersion( new Api.Models.Byond @@ -232,6 +237,7 @@ namespace Tgstation.Server.Tests.Instance public async Task StartAndLeaveRunning(CancellationToken cancellationToken) { + global::System.Console.WriteLine("TEST: WATCHDOG ENDLESS TEST"); var dd = await instanceClient.DreamDaemon.Read(cancellationToken); if(dd.ActiveCompileJob == null) await DeployTestDme("LongRunning/long_running_test", DreamDaemonSecurity.Trusted, cancellationToken); @@ -253,18 +259,16 @@ namespace Tgstation.Server.Tests.Instance try { + global::System.Console.WriteLine("TEST: Sending world reboot topic..."); var result = await bts.SendTopic(IPAddress.Loopback, "tgs_integration_test_special_tactics=1", 1337, cancellationToken); Assert.AreEqual("ack", result.StringData); - await Task.Delay(7000, cancellationToken); + await Task.Delay(10000, cancellationToken); } catch (OperationCanceledException) { throw; } - catch - { - } } async Task DeployTestDme(string dmeName, DreamDaemonSecurity deploymentSecurity, CancellationToken cancellationToken) diff --git a/tests/Tgstation.Server.Tests/IntegrationTest.cs b/tests/Tgstation.Server.Tests/IntegrationTest.cs index 523b101a15..aeff0bfffa 100644 --- a/tests/Tgstation.Server.Tests/IntegrationTest.cs +++ b/tests/Tgstation.Server.Tests/IntegrationTest.cs @@ -118,7 +118,7 @@ namespace Tgstation.Server.Tests using var hardTimeoutCts = new CancellationTokenSource(); hardTimeoutCts.CancelAfter(new TimeSpan(0, 9, 45)); var hardTimeoutCancellationToken = hardTimeoutCts.Token; - hardTimeoutCancellationToken.Register(() => Console.WriteLine("TEST TIMEOUT HARD!")); + hardTimeoutCancellationToken.Register(() => Console.WriteLine($"[{DateTimeOffset.Now}] TEST TIMEOUT HARD!")); using var softTimeoutCts = CancellationTokenSource.CreateLinkedTokenSource(hardTimeoutCancellationToken); softTimeoutCts.CancelAfter(new TimeSpan(0, 9, 15)); @@ -127,7 +127,7 @@ namespace Tgstation.Server.Tests softTimeoutCancellationToken.Register(() => { if (!tooLateForSoftTimeout) - Console.WriteLine("TEST TIMEOUT SOFT!"); + Console.WriteLine($"[{DateTimeOffset.Now}] TEST TIMEOUT SOFT!"); }); using var serverCts = CancellationTokenSource.CreateLinkedTokenSource(softTimeoutCancellationToken); @@ -297,7 +297,7 @@ namespace Tgstation.Server.Tests } catch (Exception ex) { - Console.WriteLine($"TEST ERROR: {ex.GetType()} in flight!"); + Console.WriteLine($"[{DateTimeOffset.Now}] TEST ERROR: {ex}"); throw; } finally