Improved version logging (#56)

CentCom.API/Models/AppVersionDTO.cs

@@ -1,4 +1,4 @@
-using CentCom.API.Services.Implemented;
+using CentCom.Common.Util;
 
 namespace CentCom.API.Models;
 

CentCom.API/Services/Implemented/AppStatusService.cs

@@ -1,24 +1,9 @@
 using System;
-using System.Linq;
-using System.Reflection;
 using CentCom.API.Models;
+using CentCom.Common.Util;
 
 namespace CentCom.API.Services.Implemented;
 
-internal record AssemblyInformation(string Version, string Commit, string CopyrightNotice)
-{
-    internal static readonly AssemblyInformation Current = new(typeof(AssemblyInformation).Assembly);
-
-    private AssemblyInformation(Assembly assembly) : this(
-        assembly.GetCustomAttributes<AssemblyMetadataAttribute>().FirstOrDefault(x => x.Key == "MinVerVersion")
-            ?.Value,
-        assembly.GetCustomAttributes<AssemblyMetadataAttribute>().FirstOrDefault(x => x.Key == "SourceRevisionId")
-            ?.Value,
-        assembly.GetCustomAttribute<AssemblyCopyrightAttribute>()?.Copyright)
-    {
-    }
-}
-
 public class AppStatusService : IAppStatusService
 {
     private static AppVersionDTO _versionDTO;
@@ -40,7 +25,7 @@ public ReadOnlySpan<char> GetBuildCommit(int maxHashLength = 7)
             return null;
 
         var commitSpan = AssemblyInformation.Current.Commit.AsSpan();
-        return commitSpan[..(Math.Clamp(maxHashLength, 1, commitSpan.Length) - 1)];
+        return commitSpan[..Math.Clamp(maxHashLength, 0, commitSpan.Length)];
     }
 
     /// <inheritdoc />

CentCom.Bot/Commands/AboutCommands.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using CentCom.Common.Data;
+using CentCom.Common.Util;
 using Microsoft.EntityFrameworkCore;
 using Remora.Commands.Attributes;
 using Remora.Commands.Groups;
@@ -48,7 +49,7 @@ public async Task<IResult> GetAboutAsync()
             Fields: stats,
             Colour: _feedback.Theme.Success,
             Timestamp: DateTimeOffset.UtcNow,
-            Footer: new EmbedFooter(VersionUtility.Version));
+            Footer: new EmbedFooter($"{AssemblyInformation.Current.Version} ({AssemblyInformation.Current.Commit[..7]})"));
         var result = await _feedback.SendContextualEmbedAsync(embed, ct: CancellationToken);
         return result.IsSuccess ? Result.FromSuccess() : Result.FromError(result);
     }
@@ -64,6 +65,6 @@ public async Task<IResult> GetInviteAsync()
             Description: $"[Click here]({inviteLink}) to invite me to your server!",
             Colour: _feedback.Theme.Primary,
             Timestamp: DateTimeOffset.UtcNow,
-            Footer: new EmbedFooter(VersionUtility.Version)));
+            Footer: new EmbedFooter($"{AssemblyInformation.Current.Version} ({AssemblyInformation.Current.Commit[..7]})")));
     }
 }

CentCom.Bot/Commands/SearchCommands.cs

@@ -7,6 +7,7 @@
 using CentCom.Common.Models;
 using CentCom.Common.Models.Byond;
 using CentCom.Common.Models.DTO;
+using CentCom.Common.Util;
 using Microsoft.EntityFrameworkCore;
 using Remora.Commands.Attributes;
 using Remora.Commands.Groups;
@@ -57,7 +58,7 @@ public async Task<IResult> LookupCkey(string key)
             $"their /tg/ activity on [Scrubby](https://scrubby.melonmesa.com/ckey/{key}).",
             Fields: fields,
             Timestamp: DateTimeOffset.UtcNow,
-            Footer: new EmbedFooter(VersionUtility.Version));
+            Footer: new EmbedFooter($"{AssemblyInformation.Current.Version} ({AssemblyInformation.Current.Commit[..7]})"));
 
         return await _feedback.SendContextualEmbedAsync(embed);
     }

CentCom.Common/Util/AssemblyInformation.cs

@@ -0,0 +1,20 @@
+using System.Linq;
+using System.Reflection;
+
+namespace CentCom.Common.Util;
+
+public record AssemblyInformation(string Version, string Commit, string CopyrightNotice)
+{
+    // Note that if this was ever used in a situation where projects had differing version numbers this is 
+    // getting the version number/details of CentCom.Common
+    public static readonly AssemblyInformation Current = new(typeof(AssemblyInformation).Assembly);
+
+    private AssemblyInformation(Assembly assembly) : this(
+        assembly.GetCustomAttributes<AssemblyMetadataAttribute>().FirstOrDefault(x => x.Key == "MinVerVersion")
+            ?.Value,
+        assembly.GetCustomAttributes<AssemblyMetadataAttribute>().FirstOrDefault(x => x.Key == "SourceRevisionId")
+            ?.Value,
+        assembly.GetCustomAttribute<AssemblyCopyrightAttribute>()?.Copyright)
+    {
+    }
+}

CentCom.Server/Program.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Threading.Tasks;
 using CentCom.Common.Configuration;
 using CentCom.Common.Data;
+using CentCom.Common.Util;
 using CentCom.Server.BanSources;
 using CentCom.Server.Data;
 using CentCom.Server.FlatData;
@@ -41,7 +41,8 @@ static Task Main(string[] args)
             .CreateLogger();
 
         Log.Logger.ForContext<Program>()
-            .Information("Starting CentCom Server {Version}", Assembly.GetExecutingAssembly().GetName().Version);
+            .Information("Starting CentCom Server {Version} ({Commit})", AssemblyInformation.Current.Version,
+                AssemblyInformation.Current.Commit[..7]);
 
         return CreateHostBuilder(args).RunConsoleAsync();
     }
@@ -96,7 +97,7 @@ static Task Main(string[] args)
                 services.AddSingleton<FulpBanService>();
                 services.AddSingleton<TGMCBanService>();
                 services.AddSingleton<TgBanService>();
-                    
+
                 // Standard provider is transient as it differs per request
                 services.AddTransient<StandardProviderService>();
 
@@ -127,6 +128,9 @@ static Task Main(string[] args)
                                 .WithIdentity("updater"),
                         job => job.WithIdentity("updater"));
                 });
-                services.AddQuartzHostedService();
+                services.AddQuartzHostedService(o =>
+                {
+                    o.WaitForJobsToComplete = true;
+                });
             });
 }

CentCom.sln

@@ -16,7 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		add-migration.bat = add-migration.bat
 		README.md = README.md
-		publish-script.bat = publish-script.bat
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CentCom.Bot", "CentCom.Bot\CentCom.Bot.csproj", "{A99A54D9-F216-45EA-9758-1092C82CEC57}"