From 58a78c3d2375e650d7a68a82ae5c1bdf57c11bb4 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 9 May 2020 13:42:45 -0400 Subject: [PATCH 1/3] Fix the service not installing when double clicked --- src/Tgstation.Server.Host.Service/Program.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Tgstation.Server.Host.Service/Program.cs b/src/Tgstation.Server.Host.Service/Program.cs index 1ec0f9eae2..3c20b6c98e 100644 --- a/src/Tgstation.Server.Host.Service/Program.cs +++ b/src/Tgstation.Server.Host.Service/Program.cs @@ -110,9 +110,6 @@ namespace Tgstation.Server.Host.Service using (var loggerFactory = new LoggerFactory()) { - if (Configure) - await WatchdogFactory.CreateWatchdog(loggerFactory).RunAsync(true, Array.Empty(), default).ConfigureAwait(false); - if (Install) { if (Uninstall) @@ -134,6 +131,12 @@ namespace Tgstation.Server.Host.Service var state = new ListDictionary(); installer.Install(state); } + + if (Configure) + { + Console.WriteLine("For this first run we'll launch the console runner so you may use the setup wizard."); + Console.WriteLine("If it starts successfully, feel free to close it and then start the service from the Windows control panel."); + } } else if (Uninstall) using (var installer = new ServiceInstaller()) @@ -145,6 +148,9 @@ namespace Tgstation.Server.Host.Service else if (!Configure) using (var service = new ServerService(WatchdogFactory, loggerFactory, Trace ? LogLevel.Trace : Debug ? LogLevel.Debug : LogLevel.Information)) ServiceBase.Run(service); + + if (Configure) + await WatchdogFactory.CreateWatchdog(loggerFactory).RunAsync(true, Array.Empty(), default).ConfigureAwait(false); } } } From 5da62df5fa432064e9883a6da47f1c9dc707ab56 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 9 May 2020 14:21:13 -0400 Subject: [PATCH 2/3] Fix release notes --- tools/ReleaseNotes/Program.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/ReleaseNotes/Program.cs b/tools/ReleaseNotes/Program.cs index 1fb58e67b9..94d1d9583f 100644 --- a/tools/ReleaseNotes/Program.cs +++ b/tools/ReleaseNotes/Program.cs @@ -77,6 +77,7 @@ namespace ReleaseNotes var authorizedUsers = new Dictionary>(); bool hasSqliteFuckage = false; + bool postControlPanelMessage = false; async Task GetReleaseNotesFromPR(Issue pullRequest) { @@ -243,6 +244,9 @@ namespace ReleaseNotes var webControlVersion = Version.Parse(versionsPropertyGroup.Element(xmlNamespace + "TgsControlPanelVersion").Value); var hostWatchdogVersion = Version.Parse(versionsPropertyGroup.Element(xmlNamespace + "TgsHostWatchdogVersion").Value); + if (webControlVersion.Major == 0) + postControlPanelMessage = true; + prefix = $"#### Component Versions\nCore: {coreVersion}\nHTTP API: {apiVersion}\nDreamMaker API: {dmApiVersion}\n[Web Control Panel](https://github.com/tgstation/tgstation-server-control-panel): {webControlVersion}\nHost Watchdog: {hostWatchdogVersion}"; //hasSqliteFuckage = hasSqliteFuckage && version != new Version(4, 1, 0); @@ -259,6 +263,13 @@ namespace ReleaseNotes } var newNotes = new StringBuilder(prefix); + if (postControlPanelMessage) + { + newNotes.Append(Environment.NewLine); + newNotes.Append(Environment.NewLine); + newNotes.Append("### The recommended client is currently the legacy [Tgstation.Server.ControlPanel](https://github.com/tgstation/Tgstation.Server.ControlPanel/releases/latest). This will be phased out as the web client is completed."); + } + newNotes.Append(Environment.NewLine); newNotes.Append(Environment.NewLine); if (version.Build == 0) @@ -270,7 +281,7 @@ namespace ReleaseNotes else { newNotes.Append("## [Patch "); - newNotes.Append(version.Revision); + newNotes.Append(version.Build); } newNotes.Append("]("); var milestone = await milestoneTask.ConfigureAwait(false); From 99de4e4e9aa36cf78b21da1d2094fba09f57a0b1 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 9 May 2020 14:29:33 -0400 Subject: [PATCH 3/3] Add missing error message when trying to create POSIX system identities --- src/Tgstation.Server.Host/Controllers/UserController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Controllers/UserController.cs b/src/Tgstation.Server.Host/Controllers/UserController.cs index 7cd0e25b7f..820f043ac3 100644 --- a/src/Tgstation.Server.Host/Controllers/UserController.cs +++ b/src/Tgstation.Server.Host/Controllers/UserController.cs @@ -147,7 +147,7 @@ namespace Tgstation.Server.Host.Controllers } catch (NotImplementedException) { - return StatusCode((int)HttpStatusCode.NotImplemented); + return StatusCode((int)HttpStatusCode.NotImplemented, new ErrorMessage(ErrorCode.RequiresPosixSystemIdentity)); } else {