From a721324d21c193cd87d4f73f252a75d0fa3c57ce Mon Sep 17 00:00:00 2001 From: Dominion Date: Thu, 8 Jun 2023 03:16:23 -0400 Subject: [PATCH] Fix all remaining bad semicolons Finally, peace. --- .../Components/Byond/ByondInstallerBase.cs | 3 +- .../Components/Chat/Providers/IrcProvider.cs | 6 ++-- .../Components/Deployment/DmbFactory.cs | 12 +++----- .../Components/Deployment/DreamMaker.cs | 30 +++++++------------ .../Deployment/SwappableDmbProvider.cs | 3 +- .../Components/Instance.cs | 18 ++++------- .../Components/InstanceManager.cs | 3 +- .../Repository/GitLabRemoteFeatures.cs | 3 +- .../Components/Repository/Repository.cs | 27 ++++++----------- .../Repository/RepositoryUpdateService.cs | 15 ++++------ .../Components/Session/SessionController.cs | 6 ++-- .../Components/Session/SessionPersistor.cs | 6 ++-- .../Components/StaticFiles/Configuration.cs | 3 +- .../Components/Watchdog/PosixWatchdog.cs | 6 ++-- .../Components/Watchdog/WatchdogBase.cs | 6 ++-- .../Controllers/ApiController.cs | 9 ++---- .../Controllers/ChatController.cs | 6 ++-- .../Controllers/ConfigurationController.cs | 18 ++++------- .../Controllers/DreamDaemonController.cs | 21 +++++-------- .../Controllers/DreamMakerController.cs | 12 +++----- .../Controllers/InstanceController.cs | 27 ++++++----------- .../InstancePermissionSetController.cs | 15 ++++------ .../Controllers/JobController.cs | 6 ++-- .../LimitedFileStreamResultExecutor.cs | 6 ++-- .../Controllers/RepositoryController.cs | 30 +++++++------------ .../Controllers/UserController.cs | 9 ++---- .../Controllers/UserGroupController.cs | 15 ++++------ .../Database/DatabaseSeeder.cs | 12 +++----- src/Tgstation.Server.Host/Jobs/JobService.cs | 3 +- .../Security/AuthenticationContextFactory.cs | 6 ++-- .../Security/ClaimsInjector.cs | 3 +- .../Setup/SetupWizard.cs | 24 +++++---------- .../Swarm/SwarmService.cs | 3 +- .../Utils/PortAllocator.cs | 6 ++-- 34 files changed, 126 insertions(+), 252 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Byond/ByondInstallerBase.cs b/src/Tgstation.Server.Host/Components/Byond/ByondInstallerBase.cs index df32ce6e48..75fe7bcd47 100644 --- a/src/Tgstation.Server.Host/Components/Byond/ByondInstallerBase.cs +++ b/src/Tgstation.Server.Host/Components/Byond/ByondInstallerBase.cs @@ -70,8 +70,7 @@ namespace Tgstation.Server.Host.Components.Byond IOManager.ConcatPath( PathToUserByondFolder, CacheDirectoryName), - cancellationToken) - ; + cancellationToken); } catch (OperationCanceledException) { diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs index 08d4b7a1ce..e8db69db69 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs @@ -383,8 +383,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers cancellationToken, DefaultIOManager.BlockingTaskCreationOptions, TaskScheduler.Current) - .WithToken(cancellationToken) - ; + .WithToken(cancellationToken); cancellationToken.ThrowIfCancellationRequested(); @@ -480,8 +479,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers }, cancellationToken, DefaultIOManager.BlockingTaskCreationOptions, - TaskScheduler.Current) - ; + TaskScheduler.Current); await HardDisconnect(cancellationToken); } catch (OperationCanceledException) diff --git a/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs b/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs index 7d57085eff..2c5abb0541 100644 --- a/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs +++ b/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs @@ -145,8 +145,7 @@ namespace Tgstation.Server.Host.Components.Deployment job); await remoteDeploymentManager.StageDeployment( newProvider.CompileJob, - cancellationToken) - ; + cancellationToken); } lock (jobLockCounts) @@ -188,10 +187,8 @@ namespace Tgstation.Server.Host.Components.Deployment .AsQueryable() .Where(x => x.Job.Instance.Id == metadata.Id) .OrderByDescending(x => x.Job.StoppedAt) - .FirstOrDefaultAsync(cancellationToken) - ; - }) - ; + .FirstOrDefaultAsync(cancellationToken); + }); if (cj == default(CompileJob)) return; @@ -267,8 +264,7 @@ namespace Tgstation.Server.Host.Components.Deployment ioManager.ConcatPath( newProvider.Directory, newProvider.DmbName), - cancellationToken) - ; + cancellationToken); if (!dmbExistsAtRoot) { diff --git a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs index 8470210425..31e8e3a956 100644 --- a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs +++ b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs @@ -241,8 +241,7 @@ namespace Tgstation.Server.Host.Components.Deployment StartupTimeout = x.StartupTimeout, LogOutput = x.LogOutput, }) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (ddSettings == default) throw new JobException(ErrorCode.InstanceMissingDreamDaemonSettings); @@ -250,8 +249,7 @@ namespace Tgstation.Server.Host.Components.Deployment .DreamMakerSettings .AsQueryable() .Where(x => x.InstanceId == metadata.Id) - .FirstAsync(cancellationToken) - ; + .FirstAsync(cancellationToken); if (dreamMakerSettings == default) throw new JobException(ErrorCode.InstanceMissingDreamMakerSettings); @@ -267,8 +265,7 @@ namespace Tgstation.Server.Host.Components.Deployment PushTestMergeCommits = x.PushTestMergeCommits, PostTestMergeComment = x.PostTestMergeComment, }) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (repositorySettings == default) throw new JobException(ErrorCode.InstanceMissingRepositorySettings); @@ -291,8 +288,7 @@ namespace Tgstation.Server.Host.Components.Deployment .Include(x => x.ActiveTestMerges) .ThenInclude(x => x.TestMerge) .ThenInclude(x => x.MergedBy) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (revInfo == default) { @@ -319,8 +315,7 @@ namespace Tgstation.Server.Host.Components.Deployment repo?.Dispose(); throw; } - }) - ; + }); var likelyPushedTestMergeCommit = repositorySettings.PushTestMergeCommits.Value @@ -336,8 +331,7 @@ namespace Tgstation.Server.Host.Components.Deployment progressReporter, averageSpan, likelyPushedTestMergeCommit, - cancellationToken) - ; + cancellationToken); var activeCompileJob = compileJobConsumer.LatestCompileJob(); try @@ -379,8 +373,7 @@ namespace Tgstation.Server.Host.Components.Deployment compileJob.Job = fullJob; compileJob.RevisionInformation = fullRevInfo; - }) - ; + }); } catch (Exception ex) { @@ -447,8 +440,7 @@ namespace Tgstation.Server.Host.Components.Deployment StoppedAt = x.Job.StoppedAt, StartedAt = x.Job.StartedAt, }) - .ToListAsync(cancellationToken) - ; + .ToListAsync(cancellationToken); TimeSpan? averageSpan = null; if (previousCompileJobs.Count != 0) @@ -605,8 +597,7 @@ namespace Tgstation.Server.Host.Components.Deployment repoOrigin.ToString(), $"{byondLock.Version.Major}.{byondLock.Version.Minor}", }, - cancellationToken) - ; + cancellationToken); // determine the dme progressReporter.StageName = "Determining .dme"; @@ -978,8 +969,7 @@ namespace Tgstation.Server.Host.Components.Deployment remoteDeploymentManager.FailDeployment( job, FormatExceptionForUsers(exception), - default)) - ; + default)); } } } diff --git a/src/Tgstation.Server.Host/Components/Deployment/SwappableDmbProvider.cs b/src/Tgstation.Server.Host/Components/Deployment/SwappableDmbProvider.cs index 0acc80828c..a794135d13 100644 --- a/src/Tgstation.Server.Host/Components/Deployment/SwappableDmbProvider.cs +++ b/src/Tgstation.Server.Host/Components/Deployment/SwappableDmbProvider.cs @@ -73,8 +73,7 @@ namespace Tgstation.Server.Host.Components.Deployment await symlinkFactory.CreateSymbolicLink( ioManager.ResolvePath(baseProvider.Directory), ioManager.ResolvePath(LiveGameDirectory), - cancellationToken) - ; + cancellationToken); } } } diff --git a/src/Tgstation.Server.Host/Components/Instance.cs b/src/Tgstation.Server.Host/Components/Instance.cs index 0e441edb15..42e18fa43b 100644 --- a/src/Tgstation.Server.Host/Components/Instance.cs +++ b/src/Tgstation.Server.Host/Components/Instance.cs @@ -185,8 +185,7 @@ namespace Tgstation.Server.Host.Components Configuration.StartAsync(cancellationToken), ByondManager.StartAsync(cancellationToken), Chat.StartAsync(cancellationToken), - dmbFactory.StartAsync(cancellationToken)) - ; + dmbFactory.StartAsync(cancellationToken)); // dependent on so many things, its just safer this way await Watchdog.StartAsync(cancellationToken); @@ -310,8 +309,7 @@ namespace Tgstation.Server.Host.Components repositorySettings.AccessUser, repositorySettings.AccessToken, NextProgressReporter("Fetch Origin"), - cancellationToken) - ; + cancellationToken); var hasDbChanges = false; RevisionInformation currentRevInfo = null; @@ -385,8 +383,7 @@ namespace Tgstation.Server.Host.Components repositorySettings.CommitterName, repositorySettings.CommitterEmail, NextProgressReporter("Merge Origin"), - cancellationToken) - ; + cancellationToken); var preserveTestMerges = repositorySettings.AutoUpdatesKeepTestMerges.Value; var remoteDeploymentManager = remoteDeploymentManagerFactory.CreateRemoteDeploymentManager( @@ -435,16 +432,14 @@ namespace Tgstation.Server.Host.Components repositorySettings.AccessToken, repositorySettings.UpdateSubmodules.Value, NextProgressReporter(StageName), - cancellationToken) - ; + cancellationToken); var currentHead = repo.Head; currentRevInfo = await databaseContext.RevisionInformations .AsQueryable() .Where(x => x.CommitSha == currentHead && x.Instance.Id == metadata.Id) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (currentHead != startSha && currentRevInfo == default) await UpdateRevInfo(currentHead, true, null); @@ -555,8 +550,7 @@ namespace Tgstation.Server.Host.Components progressReporter, jobCancellationToken); }, - cancellationToken) - ; + cancellationToken); } await jobManager.WaitForJobCompletion(compileProcessJob, null, default, cancellationToken); diff --git a/src/Tgstation.Server.Host/Components/InstanceManager.cs b/src/Tgstation.Server.Host/Components/InstanceManager.cs index a0c7f8ceec..1ffb944912 100644 --- a/src/Tgstation.Server.Host/Components/InstanceManager.cs +++ b/src/Tgstation.Server.Host/Components/InstanceManager.cs @@ -284,8 +284,7 @@ namespace Tgstation.Server.Host.Components await ioManager.WriteAllBytes( ioManager.ConcatPath(oldPath, InstanceController.InstanceAttachFileName), Array.Empty(), - default) - ; + default); } catch (Exception tripleEx) { diff --git a/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs b/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs index b66c98f3e1..fbb43a62ef 100644 --- a/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs +++ b/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs @@ -66,8 +66,7 @@ namespace Tgstation.Server.Host.Components.Repository var mr = await client .MergeRequests .GetAsync($"{RemoteRepositoryOwner}/{RemoteRepositoryName}", parameters.Number) - .WithToken(cancellationToken) - ; + .WithToken(cancellationToken); var revisionToUse = parameters.TargetCommitSha == null || mr.Sha.StartsWith(parameters.TargetCommitSha, StringComparison.OrdinalIgnoreCase) diff --git a/src/Tgstation.Server.Host/Components/Repository/Repository.cs b/src/Tgstation.Server.Host/Components/Repository/Repository.cs index 6025be0cff..f0256c05e1 100644 --- a/src/Tgstation.Server.Host/Components/Repository/Repository.cs +++ b/src/Tgstation.Server.Host/Components/Repository/Repository.cs @@ -356,8 +356,7 @@ namespace Tgstation.Server.Host.Components.Repository }), cancellationToken, DefaultIOManager.BlockingTaskCreationOptions, - TaskScheduler.Current) - ; + TaskScheduler.Current); if (updateSubmodules) { @@ -412,8 +411,7 @@ namespace Tgstation.Server.Host.Components.Repository }, cancellationToken, DefaultIOManager.BlockingTaskCreationOptions, - TaskScheduler.Current) - ; + TaskScheduler.Current); if (updateSubmodules) await UpdateSubmodules( @@ -463,8 +461,7 @@ namespace Tgstation.Server.Host.Components.Repository }, cancellationToken, DefaultIOManager.BlockingTaskCreationOptions, - TaskScheduler.Current) - ; + TaskScheduler.Current); } /// @@ -485,8 +482,7 @@ namespace Tgstation.Server.Host.Components.Repository await ResetToSha( trackedBranch.Tip.Sha, progressReporter.CreateSection(null, updateSubmodules ? 2.0 / 3 : 1.0), - cancellationToken) - ; + cancellationToken); if (updateSubmodules) await UpdateSubmodules( @@ -619,8 +615,7 @@ namespace Tgstation.Server.Host.Components.Repository }, cancellationToken, DefaultIOManager.BlockingTaskCreationOptions, - TaskScheduler.Current) - ; + TaskScheduler.Current); if (result.Status == MergeStatus.Conflicts) { @@ -684,8 +679,7 @@ namespace Tgstation.Server.Host.Components.Repository { ioMananger.ResolvePath(), }, - cancellationToken) - ; + cancellationToken); } finally { @@ -702,8 +696,7 @@ namespace Tgstation.Server.Host.Components.Repository }, cancellationToken, DefaultIOManager.BlockingTaskCreationOptions, - TaskScheduler.Current) - ; + TaskScheduler.Current); } var remainingProgressFactor = 0.9; @@ -759,8 +752,7 @@ namespace Tgstation.Server.Host.Components.Repository }, cancellationToken, DefaultIOManager.BlockingTaskCreationOptions, - TaskScheduler.Current) - ; + TaskScheduler.Current); } /// @@ -1040,8 +1032,7 @@ namespace Tgstation.Server.Host.Components.Repository await Task.WhenAll( ioMananger.DeleteDirectory($".git/modules/{submodule.Path}", cancellationToken), - ioMananger.DeleteDirectory(submodule.Path, cancellationToken)) - ; + ioMananger.DeleteDirectory(submodule.Path, cancellationToken)); logger.LogTrace("Second update attempt for submodule {submoduleName}...", submodule.Name); try diff --git a/src/Tgstation.Server.Host/Components/Repository/RepositoryUpdateService.cs b/src/Tgstation.Server.Host/Components/Repository/RepositoryUpdateService.cs index 4f283079de..53de9c45c3 100644 --- a/src/Tgstation.Server.Host/Components/Repository/RepositoryUpdateService.cs +++ b/src/Tgstation.Server.Host/Components/Repository/RepositoryUpdateService.cs @@ -270,8 +270,7 @@ namespace Tgstation.Server.Host.Components.Repository currentModel.CommitterEmail, NextProgressReporter("Sychronize"), true, - cancellationToken) - ; + cancellationToken); postUpdateSha = repo.Head; } else @@ -305,8 +304,7 @@ namespace Tgstation.Server.Host.Components.Repository currentModel.AccessToken, updateSubmodules, NextProgressReporter("Checkout"), - cancellationToken) - ; + cancellationToken); await CallLoadRevInfo(); // we've either seen origin before or what we're checking out is on origin } else @@ -321,8 +319,7 @@ namespace Tgstation.Server.Host.Components.Repository currentModel.AccessToken, updateSubmodules, NextProgressReporter("Reset to Origin"), - cancellationToken) - ; + cancellationToken); await repo.Sychronize( currentModel.AccessUser, currentModel.AccessToken, @@ -330,8 +327,7 @@ namespace Tgstation.Server.Host.Components.Repository currentModel.CommitterEmail, NextProgressReporter("Synchronize"), true, - cancellationToken) - ; + cancellationToken); await CallLoadRevInfo(); // repo head is on origin so force this @@ -545,8 +541,7 @@ namespace Tgstation.Server.Host.Components.Repository currentModel.CommitterEmail, NextProgressReporter("Synchronize"), false, - cancellationToken) - ; + cancellationToken); await UpdateRevInfo(); } diff --git a/src/Tgstation.Server.Host/Components/Session/SessionController.cs b/src/Tgstation.Server.Host/Components/Session/SessionController.cs index 164fb6e218..b7978ff051 100644 --- a/src/Tgstation.Server.Host/Components/Session/SessionController.cs +++ b/src/Tgstation.Server.Host/Components/Session/SessionController.cs @@ -444,8 +444,7 @@ namespace Tgstation.Server.Host.Components.Session { var commandResult = await SendCommand( new TopicParameters(port), - cancellationToken) - ; + cancellationToken); if (commandResult?.ErrorMessage != null) return false; @@ -478,8 +477,7 @@ namespace Tgstation.Server.Host.Components.Session ReattachInformation.RebootState = newRebootState; var result = await SendCommand( new TopicParameters(newRebootState), - cancellationToken) - ; + cancellationToken); return result?.ErrorMessage == null; } diff --git a/src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs b/src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs index 34b46db93c..6b1020fd92 100644 --- a/src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs +++ b/src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs @@ -140,8 +140,7 @@ namespace Tgstation.Server.Host.Components.Session .AsQueryable() .Where(x => x.Id == metadata.Id) .Select(x => x.DreamDaemonSettings.TopicRequestTimeout) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (timeoutMilliseconds == default) { @@ -238,8 +237,7 @@ namespace Tgstation.Server.Host.Components.Session if (instant) await baseQuery - .DeleteAsync(cancellationToken) - ; + .DeleteAsync(cancellationToken); else { var results = await baseQuery.ToListAsync(cancellationToken); diff --git a/src/Tgstation.Server.Host/Components/StaticFiles/Configuration.cs b/src/Tgstation.Server.Host/Components/StaticFiles/Configuration.cs index 3ba224a038..55a8aba459 100644 --- a/src/Tgstation.Server.Host/Components/StaticFiles/Configuration.cs +++ b/src/Tgstation.Server.Host/Components/StaticFiles/Configuration.cs @@ -652,8 +652,7 @@ namespace Tgstation.Server.Host.Components.StaticFiles await Task.WhenAll( ioManager.CreateDirectory(CodeModificationsSubdirectory, cancellationToken), ioManager.CreateDirectory(EventScriptsSubdirectory, cancellationToken), - ValidateStaticFolder()) - ; + ValidateStaticFolder()); } /// diff --git a/src/Tgstation.Server.Host/Components/Watchdog/PosixWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/PosixWatchdog.cs index f9f3e6bbb4..9eacfc2f17 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/PosixWatchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/PosixWatchdog.cs @@ -102,8 +102,7 @@ namespace Tgstation.Server.Host.Components.Watchdog await GameIOManager.MoveDirectory( ActiveSwappable.CompileJob.DirectoryName.ToString(), ActiveSwappable.Directory, - cancellationToken) - ; + cancellationToken); hardLinkedDmb = ActiveSwappable; } @@ -131,8 +130,7 @@ namespace Tgstation.Server.Host.Components.Watchdog await GameIOManager.MoveDirectory( hardLink, originalPosition, - default) - ; + default); } catch (Exception ex) { diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs index 258ab9709c..08ba1c8e2d 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs @@ -388,8 +388,7 @@ namespace Tgstation.Server.Host.Components.Watchdog await Chat.UpdateTrackingContexts(ct); }, - cancellationToken) - ; + cancellationToken); } /// @@ -466,8 +465,7 @@ namespace Tgstation.Server.Host.Components.Watchdog var notification = new EventNotification(eventType, parameters); var result = await activeServer.SendCommand( new TopicParameters(notification), - cancellationToken) - ; + cancellationToken); HandleChatResponses(result); } diff --git a/src/Tgstation.Server.Host/Controllers/ApiController.cs b/src/Tgstation.Server.Host/Controllers/ApiController.cs index c563525265..6f03152921 100644 --- a/src/Tgstation.Server.Host/Controllers/ApiController.cs +++ b/src/Tgstation.Server.Host/Controllers/ApiController.cs @@ -122,8 +122,7 @@ namespace Tgstation.Server.Host.Controllers await StatusCode( HttpStatusCode.UpgradeRequired, new ErrorMessageResponse(ErrorCode.ApiMismatch)) - .ExecuteResultAsync(context) - ; + .ExecuteResultAsync(context); return; } @@ -139,8 +138,7 @@ namespace Tgstation.Server.Host.Controllers if (requireHeaders) { await HeadersIssue(false) - .ExecuteResultAsync(context) - ; + .ExecuteResultAsync(context); return; } } @@ -395,8 +393,7 @@ namespace Tgstation.Server.Host.Controllers { totalResults = await paginationResult.Results.CountAsync(cancellationToken); pagedResults = await queriedResults - .ToListAsync(cancellationToken) - ; + .ToListAsync(cancellationToken); } else { diff --git a/src/Tgstation.Server.Host/Controllers/ChatController.cs b/src/Tgstation.Server.Host/Controllers/ChatController.cs index 22605192ad..3202f8924c 100644 --- a/src/Tgstation.Server.Host/Controllers/ChatController.cs +++ b/src/Tgstation.Server.Host/Controllers/ChatController.cs @@ -187,8 +187,7 @@ namespace Tgstation.Server.Host.Controllers .ChatBots .AsQueryable() .Where(x => x.Id == id) - .DeleteAsync(cancellationToken)) - ; + .DeleteAsync(cancellationToken)); return null; }) @@ -363,8 +362,7 @@ namespace Tgstation.Server.Host.Controllers await chat.ChangeChannels(current.Id.Value, current.Channels, cancellationToken); return null; - }) - ; + }); if (earlyOut != null) return earlyOut; diff --git a/src/Tgstation.Server.Host/Controllers/ConfigurationController.cs b/src/Tgstation.Server.Host/Controllers/ConfigurationController.cs index cc401330f4..d1ea19855c 100644 --- a/src/Tgstation.Server.Host/Controllers/ConfigurationController.cs +++ b/src/Tgstation.Server.Host/Controllers/ConfigurationController.cs @@ -84,12 +84,10 @@ namespace Tgstation.Server.Host.Controllers model.Path, systemIdentity, model.LastReadHash, - cancellationToken) - ; + cancellationToken); return model.LastReadHash == null ? Accepted(newFile) : Json(newFile); - }) - ; + }); } catch (IOException e) { @@ -129,14 +127,12 @@ namespace Tgstation.Server.Host.Controllers { var result = await instance .Configuration - .Read(filePath, systemIdentity, cancellationToken) - ; + .Read(filePath, systemIdentity, cancellationToken); if (result == null) return Gone(); return Json(result); - }) - ; + }); } catch (IOException e) { @@ -183,8 +179,7 @@ namespace Tgstation.Server.Host.Controllers { var result = await instance .Configuration - .ListDirectory(directoryPath, systemIdentity, cancellationToken) - ; + .ListDirectory(directoryPath, systemIdentity, cancellationToken); if (result == null) return new PaginatableResult(Gone()); @@ -257,8 +252,7 @@ namespace Tgstation.Server.Host.Controllers .Configuration .CreateDirectory(model.Path, systemIdentity, cancellationToken) ? Json(resultModel) - : Created(resultModel)) - ; + : Created(resultModel)); } catch (IOException e) { diff --git a/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs b/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs index 068b65d825..ed749e9ee0 100644 --- a/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs +++ b/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs @@ -94,8 +94,7 @@ namespace Tgstation.Server.Host.Controllers await jobManager.RegisterOperation( job, (core, databaseContextFactory, paramJob, progressHandler, innerCt) => core.Watchdog.Launch(innerCt), - cancellationToken) - ; + cancellationToken); return Accepted(job.ToApi()); }); @@ -170,8 +169,7 @@ namespace Tgstation.Server.Host.Controllers .AsQueryable() .Where(x => x.Id == Instance.Id) .Select(x => x.DreamDaemonSettings) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (current == default) return Gone(); @@ -182,8 +180,7 @@ namespace Tgstation.Server.Host.Controllers .GetAvailablePort( model.Port.Value, true, - cancellationToken) - ; + cancellationToken); if (verifiedPort != model.Port) return Conflict(new ErrorMessageResponse(ErrorCode.PortNotAvailable)); } @@ -242,8 +239,7 @@ namespace Tgstation.Server.Host.Controllers await watchdog.ResetRebootState(cancellationToken); return await ReadImpl(current, cancellationToken); - }) - ; + }); } #pragma warning restore CA1506 #pragma warning restore CA1502 @@ -277,8 +273,7 @@ namespace Tgstation.Server.Host.Controllers await jobManager.RegisterOperation( job, (core, paramJob, databaseContextFactory, progressReporter, ct) => core.Watchdog.Restart(false, ct), - cancellationToken) - ; + cancellationToken); return Accepted(job.ToApi()); }); @@ -311,8 +306,7 @@ namespace Tgstation.Server.Host.Controllers await jobManager.RegisterOperation( job, (core, databaseContextFactory, paramJob, progressReporter, ct) => core.Watchdog.CreateDump(ct), - cancellationToken) - ; + cancellationToken); return Accepted(job.ToApi()); }); @@ -337,8 +331,7 @@ namespace Tgstation.Server.Host.Controllers .AsQueryable() .Where(x => x.Id == Instance.Id) .Select(x => x.DreamDaemonSettings) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (settings == default) return Gone(); } diff --git a/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs b/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs index acd862ee72..60a99ef797 100644 --- a/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs +++ b/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs @@ -79,8 +79,7 @@ namespace Tgstation.Server.Host.Controllers .DreamMakerSettings .AsQueryable() .Where(x => x.InstanceId == Instance.Id) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); return Json(dreamMakerSettings.ToApi()); } @@ -152,8 +151,7 @@ namespace Tgstation.Server.Host.Controllers job, (core, databaseContextFactory, paramJob, progressReporter, jobCancellationToken) => core.DreamMaker.DeploymentProcess(paramJob, databaseContextFactory, progressReporter, jobCancellationToken), - cancellationToken) - ; + cancellationToken); return Accepted(job.ToApi()); } @@ -188,8 +186,7 @@ namespace Tgstation.Server.Host.Controllers .DreamMakerSettings .AsQueryable() .Where(x => x.InstanceId == Instance.Id) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (hostModel == null) return Gone(); @@ -214,8 +211,7 @@ namespace Tgstation.Server.Host.Controllers .GetAvailablePort( model.ApiValidationPort.Value, true, - cancellationToken) - ; + cancellationToken); if (verifiedPort != model.ApiValidationPort) return Conflict(new ErrorMessageResponse(ErrorCode.PortNotAvailable)); diff --git a/src/Tgstation.Server.Host/Controllers/InstanceController.cs b/src/Tgstation.Server.Host/Controllers/InstanceController.cs index 60be70f7d2..2af7714f42 100644 --- a/src/Tgstation.Server.Host/Controllers/InstanceController.cs +++ b/src/Tgstation.Server.Host/Controllers/InstanceController.cs @@ -182,8 +182,7 @@ namespace Tgstation.Server.Host.Controllers if (earlyOut != null && !newCancellationToken.IsCancellationRequested) cts.Cancel(); }, - newCancellationToken) - ; + newCancellationToken); } catch (OperationCanceledException) { @@ -419,8 +418,7 @@ namespace Tgstation.Server.Host.Controllers .ChatBots .AsQueryable() .Where(x => x.InstanceId == originalModel.Id) - .CountAsync(cancellationToken) - ; + .CountAsync(cancellationToken); if (countOfExistingChatBots > model.ChatBotLimit.Value) return Conflict(new ErrorMessageResponse(ErrorCode.ChatBotMax)); @@ -486,8 +484,7 @@ namespace Tgstation.Server.Host.Controllers job, (core, databaseContextFactory, paramJob, progressHandler, ct) // core will be null here since the instance is offline => InstanceOperations.MoveInstance(originalModel, originalModelPath, ct), - cancellationToken) - ; + cancellationToken); api.MoveJob = job.ToApi(); } @@ -548,8 +545,7 @@ namespace Tgstation.Server.Host.Controllers .Where(x => !x.StoppedAt.HasValue && x.Description.StartsWith(MoveInstanceJobPrefix)) .Include(x => x.StartedBy).ThenInclude(x => x.CreatedBy) .Include(x => x.Instance) - .ToListAsync(cancellationToken) - ; + .ToListAsync(cancellationToken); var needsUpdate = false; var result = await Paginated( @@ -565,8 +561,7 @@ namespace Tgstation.Server.Host.Controllers }, page, pageSize, - cancellationToken) - ; + cancellationToken); if (needsUpdate) await DatabaseContext.Save(cancellationToken); @@ -625,8 +620,7 @@ namespace Tgstation.Server.Host.Controllers .SelectMany(x => x.Jobs) .Where(x => !x.StoppedAt.HasValue && x.Description.StartsWith(MoveInstanceJobPrefix)) .Include(x => x.StartedBy).ThenInclude(x => x.CreatedBy) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); api.MoveJob = moveJob?.ToApi(); await CheckAccessible(api, cancellationToken); return Json(api); @@ -654,14 +648,12 @@ namespace Tgstation.Server.Host.Controllers var usersInstancePermissionSet = await BaseQuery() .SelectMany(x => x.InstancePermissionSets) .Where(x => x.PermissionSetId == AuthenticationContext.PermissionSet.Id.Value) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (usersInstancePermissionSet == default) { // does the instance actually exist? var instanceExists = await BaseQuery() - .AnyAsync(cancellationToken) - ; + .AnyAsync(cancellationToken); if (!instanceExists) return Gone(); @@ -700,8 +692,7 @@ namespace Tgstation.Server.Host.Controllers .GetAvailablePort( Math.Min((ushort)(ddPort.Value + 1), DefaultApiValidationPort), false, - cancellationToken) - ; + cancellationToken); if (!dmPort.HasValue) return null; diff --git a/src/Tgstation.Server.Host/Controllers/InstancePermissionSetController.cs b/src/Tgstation.Server.Host/Controllers/InstancePermissionSetController.cs index c04d169e3d..9caea8b34f 100644 --- a/src/Tgstation.Server.Host/Controllers/InstancePermissionSetController.cs +++ b/src/Tgstation.Server.Host/Controllers/InstancePermissionSetController.cs @@ -73,8 +73,7 @@ namespace Tgstation.Server.Host.Controllers { UserId = x.UserId, }) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (existingPermissionSet == default) return Gone(); @@ -86,8 +85,7 @@ namespace Tgstation.Server.Host.Controllers .AsQueryable() .Where(x => x.Id == existingPermissionSet.UserId.Value) .Select(x => x.CanonicalName) - .FirstAsync(cancellationToken) - ; + .FirstAsync(cancellationToken); if (userCanonicalName == Models.User.CanonicalizeName(Models.User.TgsSystemUserName)) return Forbid(); @@ -137,8 +135,7 @@ namespace Tgstation.Server.Host.Controllers .Where(x => x.Id == Instance.Id) .SelectMany(x => x.InstancePermissionSets) .Where(x => x.PermissionSetId == model.PermissionSetId) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (originalPermissionSet == null) return Gone(); @@ -219,8 +216,7 @@ namespace Tgstation.Server.Host.Controllers .Where(x => x.Id == Instance.Id) .SelectMany(x => x.InstancePermissionSets) .Where(x => x.PermissionSetId == id) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (permissionSet == default) return Gone(); return Json(permissionSet.ToApi()); @@ -246,8 +242,7 @@ namespace Tgstation.Server.Host.Controllers .Where(x => x.Id == Instance.Id) .SelectMany(x => x.InstancePermissionSets) .Where(x => x.PermissionSetId == id) - .DeleteAsync(cancellationToken) - ; + .DeleteAsync(cancellationToken); return numDeleted > 0 ? NoContent() : Gone(); } } diff --git a/src/Tgstation.Server.Host/Controllers/JobController.cs b/src/Tgstation.Server.Host/Controllers/JobController.cs index 577c3113bb..e361562e9e 100644 --- a/src/Tgstation.Server.Host/Controllers/JobController.cs +++ b/src/Tgstation.Server.Host/Controllers/JobController.cs @@ -127,8 +127,7 @@ namespace Tgstation.Server.Host.Controllers .AsQueryable() .Include(x => x.StartedBy) .Where(x => x.Id == id && x.Instance.Id == Instance.Id) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (job == default) return NotFound(); @@ -162,8 +161,7 @@ namespace Tgstation.Server.Host.Controllers .Where(x => x.Id == id && x.Instance.Id == Instance.Id) .Include(x => x.StartedBy) .Include(x => x.CancelledBy) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (job == default) return NotFound(); var api = job.ToApi(); diff --git a/src/Tgstation.Server.Host/Controllers/LimitedFileStreamResultExecutor.cs b/src/Tgstation.Server.Host/Controllers/LimitedFileStreamResultExecutor.cs index d26b0e355a..8af60dcb06 100644 --- a/src/Tgstation.Server.Host/Controllers/LimitedFileStreamResultExecutor.cs +++ b/src/Tgstation.Server.Host/Controllers/LimitedFileStreamResultExecutor.cs @@ -50,8 +50,7 @@ namespace Tgstation.Server.Host.Controllers outputStream, contentLength, BufferSize, - cancellationToken) - ; + cancellationToken); } else { @@ -61,8 +60,7 @@ namespace Tgstation.Server.Host.Controllers outputStream, rangeLength, BufferSize, - cancellationToken) - ; + cancellationToken); } } catch (OperationCanceledException) diff --git a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs index 269165b4fd..10d671a134 100644 --- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs +++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs @@ -103,8 +103,7 @@ namespace Tgstation.Server.Host.Controllers .RepositorySettings .AsQueryable() .Where(x => x.InstanceId == Instance.Id) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (currentModel == default) return Gone(); @@ -178,19 +177,16 @@ namespace Tgstation.Server.Host.Controllers databaseContext.Instances.Attach(instance); if (await PopulateApi(api, repos, databaseContext, instance, ct)) await databaseContext.Save(ct); - }) - ; + }); }, - cancellationToken) - ; + cancellationToken); api.Origin = model.Origin; api.Reference = model.Reference; api.ActiveJob = job.ToApi(); return Created(api); - }) - ; + }); } /// @@ -210,8 +206,7 @@ namespace Tgstation.Server.Host.Controllers .RepositorySettings .AsQueryable() .Where(x => x.InstanceId == Instance.Id) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (currentModel == default) return Gone(); @@ -233,8 +228,7 @@ namespace Tgstation.Server.Host.Controllers await jobManager.RegisterOperation( job, (core, databaseContextFactory, paramJob, progressReporter, ct) => core.RepositoryManager.DeleteRepository(ct), - cancellationToken) - ; + cancellationToken); api.ActiveJob = job.ToApi(); return Accepted(api); } @@ -258,8 +252,7 @@ namespace Tgstation.Server.Host.Controllers .RepositorySettings .AsQueryable() .Where(x => x.InstanceId == Instance.Id) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (currentModel == default) return Gone(); @@ -286,8 +279,7 @@ namespace Tgstation.Server.Host.Controllers } return Json(api); - }) - ; + }); } /// @@ -347,8 +339,7 @@ namespace Tgstation.Server.Host.Controllers .RepositorySettings .AsQueryable() .Where(x => x.InstanceId == Instance.Id) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (currentModel == default) return Gone(); @@ -412,8 +403,7 @@ namespace Tgstation.Server.Host.Controllers await PopulateApi(api, repo, DatabaseContext, Instance, cancellationToken); return null; - }) - ; + }); if (earlyOut != null) return earlyOut; diff --git a/src/Tgstation.Server.Host/Controllers/UserController.cs b/src/Tgstation.Server.Host/Controllers/UserController.cs index 78ed4839c7..f4cfd58898 100644 --- a/src/Tgstation.Server.Host/Controllers/UserController.cs +++ b/src/Tgstation.Server.Host/Controllers/UserController.cs @@ -195,8 +195,7 @@ namespace Tgstation.Server.Host.Controllers .Include(x => x.Group) .ThenInclude(x => x.PermissionSet) .Include(x => x.PermissionSet) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (originalUser == default) return NotFound(); @@ -265,8 +264,7 @@ namespace Tgstation.Server.Host.Controllers .AsQueryable() .Where(x => x.Id == model.Group.Id) .Include(x => x.PermissionSet) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (originalUser.Group == default) return Gone(); @@ -408,8 +406,7 @@ namespace Tgstation.Server.Host.Controllers .AsQueryable() .Where(x => x.Id == model.Group.Id) .Include(x => x.PermissionSet) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); else permissionSet = new Models.PermissionSet { diff --git a/src/Tgstation.Server.Host/Controllers/UserGroupController.cs b/src/Tgstation.Server.Host/Controllers/UserGroupController.cs index 1e38468534..a7269ebaf4 100644 --- a/src/Tgstation.Server.Host/Controllers/UserGroupController.cs +++ b/src/Tgstation.Server.Host/Controllers/UserGroupController.cs @@ -75,8 +75,7 @@ namespace Tgstation.Server.Host.Controllers var totalGroups = await DatabaseContext .Groups .AsQueryable() - .CountAsync(cancellationToken) - ; + .CountAsync(cancellationToken); if (totalGroups >= generalConfiguration.UserGroupLimit) return Conflict(new ErrorMessageResponse(ErrorCode.UserGroupLimitReached)); @@ -121,8 +120,7 @@ namespace Tgstation.Server.Host.Controllers .Where(x => x.Id == model.Id) .Include(x => x.PermissionSet) .Include(x => x.Users) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (currentGroup == default) return Gone(); @@ -167,8 +165,7 @@ namespace Tgstation.Server.Host.Controllers .Where(x => x.Id == id) .Include(x => x.Users) .Include(x => x.PermissionSet) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (group == default) return Gone(); return Json(group.ToApi(true)); @@ -220,8 +217,7 @@ namespace Tgstation.Server.Host.Controllers .Groups .AsQueryable() .Where(x => x.Id == id && x.Users.Count == 0) - .DeleteAsync(cancellationToken) - ; + .DeleteAsync(cancellationToken); if (numDeleted > 0) return NoContent(); @@ -231,8 +227,7 @@ namespace Tgstation.Server.Host.Controllers .Groups .AsQueryable() .Where(x => x.Id == id) - .AnyAsync(cancellationToken) - ; + .AnyAsync(cancellationToken); return groupExists ? Conflict(new ErrorMessageResponse(ErrorCode.UserGroupNotEmpty)) diff --git a/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs b/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs index b0dd4eb436..66e74968e0 100644 --- a/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs +++ b/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs @@ -215,8 +215,7 @@ namespace Tgstation.Server.Host.Database .Users .AsQueryable() .Where(x => x.CanonicalName == User.CanonicalizeName(User.TgsSystemUserName)) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (tgsUser != null) logger.LogError( @@ -233,8 +232,7 @@ namespace Tgstation.Server.Host.Database var allInstances = await databaseContext .Instances .AsQueryable() - .ToListAsync(cancellationToken) - ; + .ToListAsync(cancellationToken); foreach (var instance in allInstances) instance.Path = instance.Path.Replace('\\', '/'); } @@ -246,8 +244,7 @@ namespace Tgstation.Server.Host.Database .AsQueryable() .Where(x => x.TopicRequestTimeout == 0) .Select(x => x.Id) - .ToListAsync(cancellationToken) - ; + .ToListAsync(cancellationToken); var rowsUpdated = ids.Count; foreach (var id in ids) @@ -318,8 +315,7 @@ namespace Tgstation.Server.Host.Database .Include(x => x.CreatedBy) .Include(x => x.PermissionSet) .Include(x => x.Group) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (admin == default) SeedAdminUser(databaseContext); diff --git a/src/Tgstation.Server.Host/Jobs/JobService.cs b/src/Tgstation.Server.Host/Jobs/JobService.cs index 971150061a..efa0b09137 100644 --- a/src/Tgstation.Server.Host/Jobs/JobService.cs +++ b/src/Tgstation.Server.Host/Jobs/JobService.cs @@ -108,8 +108,7 @@ namespace Tgstation.Server.Host.Jobs if (job.StartedBy == null) job.StartedBy = await databaseContext .Users - .GetTgsUser(cancellationToken) - ; + .GetTgsUser(cancellationToken); else job.StartedBy = new User { diff --git a/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs b/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs index c28d1e1da1..24ab9707ea 100644 --- a/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs +++ b/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs @@ -76,8 +76,7 @@ namespace Tgstation.Server.Host.Security .Include(x => x.Group) .ThenInclude(x => x.PermissionSet) .Include(x => x.OAuthConnections) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (user == default) { logger.LogWarning("Unable to find user with ID {0}!", userId); @@ -110,8 +109,7 @@ namespace Tgstation.Server.Host.Security .AsQueryable() .Where(x => x.PermissionSetId == userPermissionSet.Id && x.InstanceId == instanceId && x.Instance.SwarmIdentifer == swarmConfiguration.Identifier) .Include(x => x.Instance) - .FirstOrDefaultAsync(cancellationToken) - ; + .FirstOrDefaultAsync(cancellationToken); if (instancePermissionSet == null) logger.LogDebug("User {0} does not have permissions on instance {1}!", userId, instanceId.Value); diff --git a/src/Tgstation.Server.Host/Security/ClaimsInjector.cs b/src/Tgstation.Server.Host/Security/ClaimsInjector.cs index 933e073ec0..de5dacc66e 100644 --- a/src/Tgstation.Server.Host/Security/ClaimsInjector.cs +++ b/src/Tgstation.Server.Host/Security/ClaimsInjector.cs @@ -68,8 +68,7 @@ namespace Tgstation.Server.Host.Security userId, apiHeaders.InstanceId, tokenValidatedContext.SecurityToken.ValidFrom, - cancellationToken) - ; + cancellationToken); var authenticationContext = authenticationContextFactory.CurrentAuthenticationContext; diff --git a/src/Tgstation.Server.Host/Setup/SetupWizard.cs b/src/Tgstation.Server.Host/Setup/SetupWizard.cs index 629dbf0a41..c4633f0846 100644 --- a/src/Tgstation.Server.Host/Setup/SetupWizard.cs +++ b/src/Tgstation.Server.Host/Setup/SetupWizard.cs @@ -176,8 +176,7 @@ namespace Tgstation.Server.Host.Setup await console.WriteAsync( $"API Port (leave blank for default of {GeneralConfiguration.DefaultApiPort}): ", false, - cancellationToken) - ; + cancellationToken); var portString = await console.ReadLineAsync(false, cancellationToken); if (String.IsNullOrWhiteSpace(portString)) return null; @@ -319,8 +318,7 @@ namespace Tgstation.Server.Host.Setup await console.WriteAsync(resolvedPath, true, cancellationToken); bool writeResolved = await PromptYesNo( "Would you like to save the relative path in the configuration? If not, the full path will be saved. (y/n): ", - cancellationToken) - ; + cancellationToken); if (writeResolved) databaseName = resolvedPath; @@ -344,23 +342,19 @@ namespace Tgstation.Server.Host.Setup await console.WriteAsync( "NOTE: It is HIGHLY reccommended that TGS runs on a complete relational database, specfically *NOT* Sqlite.", true, - cancellationToken) - ; + cancellationToken); await console.WriteAsync( "Sqlite, by nature cannot perform several DDL operations. Because of this future compatiblility cannot be guaranteed.", true, - cancellationToken) - ; + cancellationToken); await console.WriteAsync( "This means that you may not be able to update to the next minor version of TGS without a clean re-installation!", true, - cancellationToken) - ; + cancellationToken); await console.WriteAsync( "Please consider taking the time to set up a relational database if this is meant to be a long-standing server.", true, - cancellationToken) - ; + cancellationToken); await console.WriteAsync(String.Empty, true, cancellationToken); await asyncDelayer.Delay(TimeSpan.FromSeconds(3), cancellationToken); @@ -379,8 +373,7 @@ namespace Tgstation.Server.Host.Setup DatabaseType.SqlServer, DatabaseType.Sqlite), false, - cancellationToken) - ; + cancellationToken); var databaseTypeString = await console.ReadLineAsync(false, cancellationToken); if (Enum.TryParse(databaseTypeString, out var databaseType)) return databaseType; @@ -1007,8 +1000,7 @@ namespace Tgstation.Server.Host.Setup elasticSearchConfiguration, controlPanelConfiguration, swarmConfiguration, - cancellationToken) - ; + cancellationToken); } /// diff --git a/src/Tgstation.Server.Host/Swarm/SwarmService.cs b/src/Tgstation.Server.Host/Swarm/SwarmService.cs index 8f8a5ce7a9..14bb870554 100644 --- a/src/Tgstation.Server.Host/Swarm/SwarmService.cs +++ b/src/Tgstation.Server.Host/Swarm/SwarmService.cs @@ -965,8 +965,7 @@ namespace Tgstation.Server.Host.Swarm await Task.WhenAll( currentSwarmServers .Where(x => !x.Controller) - .Select(HealthRequestForServer)) - ; + .Select(HealthRequestForServer)); lock (swarmServers) if (swarmServers.Count != currentSwarmServers.Count) diff --git a/src/Tgstation.Server.Host/Utils/PortAllocator.cs b/src/Tgstation.Server.Host/Utils/PortAllocator.cs index 87ac3ecd05..9b125103d0 100644 --- a/src/Tgstation.Server.Host/Utils/PortAllocator.cs +++ b/src/Tgstation.Server.Host/Utils/PortAllocator.cs @@ -67,16 +67,14 @@ namespace Tgstation.Server.Host.Utils .AsQueryable() .Where(x => x.Instance.SwarmIdentifer == swarmConfiguration.Identifier) .Select(x => x.Port) - .ToListAsync(cancellationToken) - ; + .ToListAsync(cancellationToken); var dmPorts = await databaseContext .DreamMakerSettings .AsQueryable() .Where(x => x.Instance.SwarmIdentifer == swarmConfiguration.Identifier) .Select(x => x.ApiValidationPort) - .ToListAsync(cancellationToken) - ; + .ToListAsync(cancellationToken); var exceptions = new List(); ushort port = 0;