From c38ca2e7fa097ffd4b79e2d16248ed51efefcdf8 Mon Sep 17 00:00:00 2001
From: spiral <spiral@spiral.sh>
Date: Mon, 24 Jan 2022 08:13:59 -0500
Subject: [PATCH] feat: add git commit hash to Serilog context

---
 PluralKit.API/Startup.cs                |  2 +-
 PluralKit.Bot/Init.cs                   | 10 +++++-----
 PluralKit.Core/Modules/LoggingModule.cs |  1 +
 PluralKit.ScheduledTasks/Startup.cs     |  2 ++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/PluralKit.API/Startup.cs b/PluralKit.API/Startup.cs
index 8fc151b1..d8c986fc 100644
--- a/PluralKit.API/Startup.cs
+++ b/PluralKit.API/Startup.cs
@@ -115,7 +115,7 @@ public class Startup
         // add X-PluralKit-Version header
         app.Use((ctx, next) =>
         {
-            ctx.Response.Headers.Add("X-PluralKit-Version", BuildInfoService.Version);
+            ctx.Response.Headers.Add("X-PluralKit-Version", BuildInfoService.FullVersion);
             return next();
         });
 
diff --git a/PluralKit.Bot/Init.cs b/PluralKit.Bot/Init.cs
index 77c1422d..58699111 100644
--- a/PluralKit.Bot/Init.cs
+++ b/PluralKit.Bot/Init.cs
@@ -16,20 +16,20 @@ namespace PluralKit.Bot;
 
 public class Init
 {
-    private static Task Main(string[] args)
+    private static async Task Main(string[] args)
     {
         // Load configuration and run global init stuff
         var config = InitUtils.BuildConfiguration(args).Build();
         InitUtils.InitStatic();
 
+        // init version service
+        await BuildInfoService.LoadVersion();
+
         // Set up DI container and modules
         var services = BuildContainer(config);
 
-        return RunWrapper(services, async ct =>
+        await RunWrapper(services, async ct =>
         {
-            // init version service
-            await BuildInfoService.LoadVersion();
-
             var logger = services.Resolve<ILogger>().ForContext<Init>();
 
             // Initialize Sentry SDK, and make sure it gets dropped at the end
diff --git a/PluralKit.Core/Modules/LoggingModule.cs b/PluralKit.Core/Modules/LoggingModule.cs
index bd259868..00b662f4 100644
--- a/PluralKit.Core/Modules/LoggingModule.cs
+++ b/PluralKit.Core/Modules/LoggingModule.cs
@@ -52,6 +52,7 @@ public class LoggingModule: Module
 
         var logCfg = _cfg
             .Enrich.FromLogContext()
+            .Enrich.WithProperty("GitCommitHash", BuildInfoService.FullVersion)
             .ConfigureForNodaTime(DateTimeZoneProviders.Tzdb)
             .Enrich.WithProperty("Component", _component)
             .MinimumLevel.Is(config.ConsoleLogLevel)
diff --git a/PluralKit.ScheduledTasks/Startup.cs b/PluralKit.ScheduledTasks/Startup.cs
index cdd36841..6aff729f 100644
--- a/PluralKit.ScheduledTasks/Startup.cs
+++ b/PluralKit.ScheduledTasks/Startup.cs
@@ -16,6 +16,8 @@ internal class Startup
         var config = InitUtils.BuildConfiguration(args).Build();
         InitUtils.InitStatic();
 
+        await BuildInfoService.LoadVersion();
+
         var services = BuildContainer(config);
         services.Resolve<TaskHandler>().Run();