feat: show bot version on startup and in /catalogger ping
This commit is contained in:
parent
a22057b9fa
commit
5ac607fd0a
6 changed files with 66 additions and 4 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -5,3 +5,4 @@ riderModule.iml
|
||||||
/_ReSharper.Caches/
|
/_ReSharper.Caches/
|
||||||
config.ini
|
config.ini
|
||||||
*.DotSettings.user
|
*.DotSettings.user
|
||||||
|
.version
|
||||||
|
|
|
||||||
|
|
@ -176,7 +176,7 @@ public class MetaCommands(
|
||||||
var embed = new EmbedBuilder()
|
var embed = new EmbedBuilder()
|
||||||
.WithColour(DiscordUtils.Purple)
|
.WithColour(DiscordUtils.Purple)
|
||||||
.WithFooter(
|
.WithFooter(
|
||||||
$"{RuntimeInformation.FrameworkDescription} on {RuntimeInformation.RuntimeIdentifier}"
|
$"{BuildInfo.Version}, {RuntimeInformation.FrameworkDescription} on {RuntimeInformation.RuntimeIdentifier}"
|
||||||
)
|
)
|
||||||
.WithCurrentTimestamp();
|
.WithCurrentTimestamp();
|
||||||
embed.AddField(
|
embed.AddField(
|
||||||
|
|
@ -209,8 +209,7 @@ public class MetaCommands(
|
||||||
"Numbers",
|
"Numbers",
|
||||||
$"{CataloggerMetrics.MessagesStored.Value:N0} messages "
|
$"{CataloggerMetrics.MessagesStored.Value:N0} messages "
|
||||||
+ $"from {guildCache.Size:N0} servers\n"
|
+ $"from {guildCache.Size:N0} servers\n"
|
||||||
+ $"Cached {channelCache.Size:N0} channels, {roleCache.Size:N0} roles, {emojiCache.Size:N0} emojis",
|
+ $"Cached {channelCache.Size:N0} channels, {roleCache.Size:N0} roles, {emojiCache.Size:N0} emojis"
|
||||||
false
|
|
||||||
);
|
);
|
||||||
|
|
||||||
IEmbed[] embeds = [embed.Build().GetOrThrow()];
|
IEmbed[] embeds = [embed.Build().GetOrThrow()];
|
||||||
|
|
|
||||||
46
Catalogger.Backend/BuildInfo.cs
Normal file
46
Catalogger.Backend/BuildInfo.cs
Normal file
|
|
@ -0,0 +1,46 @@
|
||||||
|
// Copyright (C) 2021-present sam (starshines.gay)
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Affero General Public License as published
|
||||||
|
// by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Affero General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
namespace Catalogger.Backend;
|
||||||
|
|
||||||
|
public static class BuildInfo
|
||||||
|
{
|
||||||
|
public static string Hash { get; private set; } = "(unknown)";
|
||||||
|
public static string Version { get; private set; } = "(unknown)";
|
||||||
|
|
||||||
|
public static async Task ReadBuildInfo()
|
||||||
|
{
|
||||||
|
await using var stream = typeof(BuildInfo).Assembly.GetManifestResourceStream("version");
|
||||||
|
if (stream == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
using var reader = new StreamReader(stream);
|
||||||
|
var data = (await reader.ReadToEndAsync()).Trim().Split("\n");
|
||||||
|
if (data.Length < 3)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Hash = data[0];
|
||||||
|
var dirty = data[2] == "dirty";
|
||||||
|
|
||||||
|
var versionData = data[1].Split("-");
|
||||||
|
if (versionData.Length < 3)
|
||||||
|
return;
|
||||||
|
Version = versionData[0];
|
||||||
|
if (versionData[1] != "0" || dirty)
|
||||||
|
Version += $"+{versionData[2]}";
|
||||||
|
if (dirty)
|
||||||
|
Version += ".dirty";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -7,8 +7,14 @@
|
||||||
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
|
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Target Name="SetSourceRevisionId" BeforeTargets="InitializeSourceControlInformation">
|
||||||
|
<Exec Command="../build_info.sh" IgnoreExitCode="false">
|
||||||
|
</Exec>
|
||||||
|
</Target>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedResource Include="Database/**/*.sql" />
|
<EmbeddedResource Include="Database/**/*.sql" />
|
||||||
|
<EmbeddedResource Watch="false" Include="..\.version" LogicalName="version"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -186,9 +186,15 @@ public static class StartupExtensions
|
||||||
|
|
||||||
public static async Task Initialize(this WebApplication app)
|
public static async Task Initialize(this WebApplication app)
|
||||||
{
|
{
|
||||||
|
await BuildInfo.ReadBuildInfo();
|
||||||
|
|
||||||
await using var scope = app.Services.CreateAsyncScope();
|
await using var scope = app.Services.CreateAsyncScope();
|
||||||
var logger = scope.ServiceProvider.GetRequiredService<ILogger>().ForContext<Program>();
|
var logger = scope.ServiceProvider.GetRequiredService<ILogger>().ForContext<Program>();
|
||||||
logger.Information("Starting Catalogger.NET");
|
logger.Information(
|
||||||
|
"Starting Catalogger.NET {Version} ({Hash})",
|
||||||
|
BuildInfo.Version,
|
||||||
|
BuildInfo.Hash
|
||||||
|
);
|
||||||
|
|
||||||
CataloggerMetrics.Startup = scope
|
CataloggerMetrics.Startup = scope
|
||||||
.ServiceProvider.GetRequiredService<IClock>()
|
.ServiceProvider.GetRequiredService<IClock>()
|
||||||
|
|
|
||||||
4
build_info.sh
Executable file
4
build_info.sh
Executable file
|
|
@ -0,0 +1,4 @@
|
||||||
|
#!/bin/sh
|
||||||
|
(git rev-parse HEAD &&
|
||||||
|
git describe --tags --always --long &&
|
||||||
|
if test -z "$(git ls-files --exclude-standard --modified --deleted --others)"; then echo clean; else echo dirty; fi) > ../.version
|
||||||
Loading…
Add table
Add a link
Reference in a new issue