feat: upgrade to .NET 6, refactor everything
This commit is contained in:
spiral
@@ -1,8 +1,3 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using Autofac;
|
||||
|
||||
using Microsoft.Extensions.Configuration;
|
||||
@@ -17,157 +12,154 @@ using Sentry;
|
||||
using Serilog;
|
||||
using Serilog.Core;
|
||||
|
||||
namespace PluralKit.Bot
|
||||
namespace PluralKit.Bot;
|
||||
|
||||
public class Init
|
||||
{
|
||||
public class Init
|
||||
private static Task Main(string[] args)
|
||||
{
|
||||
static Task Main(string[] args)
|
||||
// Load configuration and run global init stuff
|
||||
var config = InitUtils.BuildConfiguration(args).Build();
|
||||
InitUtils.InitStatic();
|
||||
|
||||
// Set up DI container and modules
|
||||
var services = BuildContainer(config);
|
||||
|
||||
return RunWrapper(services, async ct =>
|
||||
{
|
||||
// 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 =>
|
||||
{
|
||||
// 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
|
||||
|
||||
using var _ = Sentry.SentrySdk.Init((opts) =>
|
||||
{
|
||||
opts.Dsn = services.Resolve<CoreConfig>().SentryUrl;
|
||||
opts.Release = BuildInfoService.FullVersion;
|
||||
opts.AutoSessionTracking = true;
|
||||
opts.DisableTaskUnobservedTaskExceptionCapture();
|
||||
});
|
||||
|
||||
// "Connect to the database" (ie. set off database migrations and ensure state)
|
||||
logger.Information("Connecting to database");
|
||||
await services.Resolve<IDatabase>().ApplyMigrations();
|
||||
|
||||
// Init the bot instance itself, register handlers and such to the client before beginning to connect
|
||||
logger.Information("Initializing bot");
|
||||
var bot = services.Resolve<Bot>();
|
||||
bot.Init();
|
||||
|
||||
// Start the Discord shards themselves (handlers already set up)
|
||||
logger.Information("Connecting to Discord");
|
||||
await StartCluster(services);
|
||||
logger.Information("Connected! All is good (probably).");
|
||||
|
||||
// Lastly, we just... wait. Everything else is handled in the DiscordClient event loop
|
||||
try
|
||||
{
|
||||
await Task.Delay(-1, ct);
|
||||
}
|
||||
catch (TaskCanceledException)
|
||||
{
|
||||
// Once the CancellationToken fires, we need to shut stuff down
|
||||
// (generally happens given a SIGINT/SIGKILL/Ctrl-C, see calling wrapper)
|
||||
await bot.Shutdown();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static async Task RunWrapper(IContainer services, Func<CancellationToken, Task> taskFunc)
|
||||
{
|
||||
// This function does a couple things:
|
||||
// - Creates a CancellationToken that'll cancel tasks once needed
|
||||
// - Wraps the given function in an exception handler that properly logs errors
|
||||
// - Adds a SIGINT (Ctrl-C) listener through Console.CancelKeyPress to gracefully shut down
|
||||
// - Adds a SIGTERM (kill, systemctl stop, docker stop) listener through AppDomain.ProcessExit (same as above)
|
||||
var logger = services.Resolve<ILogger>().ForContext<Init>();
|
||||
|
||||
var shutdown = new TaskCompletionSource<object>();
|
||||
var gracefulShutdownCts = new CancellationTokenSource();
|
||||
// Initialize Sentry SDK, and make sure it gets dropped at the end
|
||||
|
||||
Console.CancelKeyPress += delegate
|
||||
using var _ = SentrySdk.Init(opts =>
|
||||
{
|
||||
// ReSharper disable once AccessToDisposedClosure (will only be hit before the below disposal)
|
||||
logger.Information("Received SIGINT/Ctrl-C, attempting graceful shutdown...");
|
||||
gracefulShutdownCts.Cancel();
|
||||
};
|
||||
opts.Dsn = services.Resolve<CoreConfig>().SentryUrl;
|
||||
opts.Release = BuildInfoService.FullVersion;
|
||||
opts.AutoSessionTracking = true;
|
||||
opts.DisableTaskUnobservedTaskExceptionCapture();
|
||||
});
|
||||
|
||||
AppDomain.CurrentDomain.ProcessExit += (_, __) =>
|
||||
{
|
||||
// This callback is fired on a SIGKILL is sent.
|
||||
// The runtime will kill the program as soon as this callback is finished, so we have to
|
||||
// block on the shutdown task's completion to ensure everything is sorted by the time this returns.
|
||||
// "Connect to the database" (ie. set off database migrations and ensure state)
|
||||
logger.Information("Connecting to database");
|
||||
await services.Resolve<IDatabase>().ApplyMigrations();
|
||||
|
||||
// ReSharper disable once AccessToDisposedClosure (it's only disposed after the block)
|
||||
logger.Information("Received SIGKILL event, attempting graceful shutdown...");
|
||||
gracefulShutdownCts.Cancel();
|
||||
var ___ = shutdown.Task.Result; // Blocking! This is the only time it's justified...
|
||||
};
|
||||
// Init the bot instance itself, register handlers and such to the client before beginning to connect
|
||||
logger.Information("Initializing bot");
|
||||
var bot = services.Resolve<Bot>();
|
||||
bot.Init();
|
||||
|
||||
// Start the Discord shards themselves (handlers already set up)
|
||||
logger.Information("Connecting to Discord");
|
||||
await StartCluster(services);
|
||||
logger.Information("Connected! All is good (probably).");
|
||||
|
||||
// Lastly, we just... wait. Everything else is handled in the DiscordClient event loop
|
||||
try
|
||||
{
|
||||
await taskFunc(gracefulShutdownCts.Token);
|
||||
logger.Information("Shutdown complete. Have a nice day~");
|
||||
await Task.Delay(-1, ct);
|
||||
}
|
||||
catch (Exception e)
|
||||
catch (TaskCanceledException)
|
||||
{
|
||||
logger.Fatal(e, "Error while running bot");
|
||||
// Once the CancellationToken fires, we need to shut stuff down
|
||||
// (generally happens given a SIGINT/SIGKILL/Ctrl-C, see calling wrapper)
|
||||
await bot.Shutdown();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Allow the log buffer to flush properly before exiting
|
||||
((Logger)logger).Dispose();
|
||||
await Task.Delay(500);
|
||||
shutdown.SetResult(null);
|
||||
private static async Task RunWrapper(IContainer services, Func<CancellationToken, Task> taskFunc)
|
||||
{
|
||||
// This function does a couple things:
|
||||
// - Creates a CancellationToken that'll cancel tasks once needed
|
||||
// - Wraps the given function in an exception handler that properly logs errors
|
||||
// - Adds a SIGINT (Ctrl-C) listener through Console.CancelKeyPress to gracefully shut down
|
||||
// - Adds a SIGTERM (kill, systemctl stop, docker stop) listener through AppDomain.ProcessExit (same as above)
|
||||
var logger = services.Resolve<ILogger>().ForContext<Init>();
|
||||
|
||||
var shutdown = new TaskCompletionSource<object>();
|
||||
var gracefulShutdownCts = new CancellationTokenSource();
|
||||
|
||||
Console.CancelKeyPress += delegate
|
||||
{
|
||||
// ReSharper disable once AccessToDisposedClosure (will only be hit before the below disposal)
|
||||
logger.Information("Received SIGINT/Ctrl-C, attempting graceful shutdown...");
|
||||
gracefulShutdownCts.Cancel();
|
||||
};
|
||||
|
||||
AppDomain.CurrentDomain.ProcessExit += (_, __) =>
|
||||
{
|
||||
// This callback is fired on a SIGKILL is sent.
|
||||
// The runtime will kill the program as soon as this callback is finished, so we have to
|
||||
// block on the shutdown task's completion to ensure everything is sorted by the time this returns.
|
||||
|
||||
// ReSharper disable once AccessToDisposedClosure (it's only disposed after the block)
|
||||
logger.Information("Received SIGKILL event, attempting graceful shutdown...");
|
||||
gracefulShutdownCts.Cancel();
|
||||
var ___ = shutdown.Task.Result; // Blocking! This is the only time it's justified...
|
||||
};
|
||||
|
||||
try
|
||||
{
|
||||
await taskFunc(gracefulShutdownCts.Token);
|
||||
logger.Information("Shutdown complete. Have a nice day~");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
logger.Fatal(e, "Error while running bot");
|
||||
}
|
||||
|
||||
private static IContainer BuildContainer(IConfiguration config)
|
||||
// Allow the log buffer to flush properly before exiting
|
||||
((Logger)logger).Dispose();
|
||||
await Task.Delay(500);
|
||||
shutdown.SetResult(null);
|
||||
}
|
||||
|
||||
private static IContainer BuildContainer(IConfiguration config)
|
||||
{
|
||||
var builder = new ContainerBuilder();
|
||||
builder.RegisterInstance(config);
|
||||
builder.RegisterModule(new ConfigModule<BotConfig>("Bot"));
|
||||
builder.RegisterModule(new LoggingModule("bot", cfg =>
|
||||
{
|
||||
var builder = new ContainerBuilder();
|
||||
builder.RegisterInstance(config);
|
||||
builder.RegisterModule(new ConfigModule<BotConfig>("Bot"));
|
||||
builder.RegisterModule(new LoggingModule("bot", cfg =>
|
||||
{
|
||||
// TODO: do we need this?
|
||||
// cfg.Destructure.With<EventDestructuring>();
|
||||
}));
|
||||
builder.RegisterModule(new MetricsModule());
|
||||
builder.RegisterModule<DataStoreModule>();
|
||||
builder.RegisterModule<BotModule>();
|
||||
return builder.Build();
|
||||
// TODO: do we need this?
|
||||
// cfg.Destructure.With<EventDestructuring>();
|
||||
}));
|
||||
builder.RegisterModule(new MetricsModule());
|
||||
builder.RegisterModule<DataStoreModule>();
|
||||
builder.RegisterModule<BotModule>();
|
||||
return builder.Build();
|
||||
}
|
||||
|
||||
private static async Task StartCluster(IComponentContext services)
|
||||
{
|
||||
var info = await services.Resolve<DiscordApiClient>().GetGatewayBot();
|
||||
|
||||
var cluster = services.Resolve<Cluster>();
|
||||
var config = services.Resolve<BotConfig>();
|
||||
|
||||
if (config.Cluster != null)
|
||||
{
|
||||
// For multi-instance deployments, calculate the "span" of shards this node is responsible for
|
||||
var totalNodes = config.Cluster.TotalNodes;
|
||||
var totalShards = config.Cluster.TotalShards;
|
||||
var nodeIndex = ExtractNodeIndex(config.Cluster.NodeName);
|
||||
|
||||
// Should evenly distribute shards even with an uneven amount of nodes
|
||||
var shardMin = (int)Math.Round(totalShards * (float)nodeIndex / totalNodes);
|
||||
var shardMax = (int)Math.Round(totalShards * (float)(nodeIndex + 1) / totalNodes) - 1;
|
||||
|
||||
await cluster.Start(info.Url, shardMin, shardMax, totalShards, info.SessionStartLimit.MaxConcurrency);
|
||||
}
|
||||
|
||||
private static async Task StartCluster(IComponentContext services)
|
||||
else
|
||||
{
|
||||
var info = await services.Resolve<DiscordApiClient>().GetGatewayBot();
|
||||
|
||||
var cluster = services.Resolve<Cluster>();
|
||||
var config = services.Resolve<BotConfig>();
|
||||
|
||||
if (config.Cluster != null)
|
||||
{
|
||||
// For multi-instance deployments, calculate the "span" of shards this node is responsible for
|
||||
var totalNodes = config.Cluster.TotalNodes;
|
||||
var totalShards = config.Cluster.TotalShards;
|
||||
var nodeIndex = ExtractNodeIndex(config.Cluster.NodeName);
|
||||
|
||||
// Should evenly distribute shards even with an uneven amount of nodes
|
||||
var shardMin = (int)Math.Round(totalShards * (float)nodeIndex / totalNodes);
|
||||
var shardMax = (int)Math.Round(totalShards * (float)(nodeIndex + 1) / totalNodes) - 1;
|
||||
|
||||
await cluster.Start(info.Url, shardMin, shardMax, totalShards, info.SessionStartLimit.MaxConcurrency);
|
||||
}
|
||||
else
|
||||
{
|
||||
await cluster.Start(info);
|
||||
}
|
||||
}
|
||||
|
||||
private static int ExtractNodeIndex(string nodeName)
|
||||
{
|
||||
// Node name eg. "pluralkit-3", want to extract the 3. blame k8s :p
|
||||
return int.Parse(nodeName.Split("-").Last());
|
||||
await cluster.Start(info);
|
||||
}
|
||||
}
|
||||
|
||||
private static int ExtractNodeIndex(string nodeName) =>
|
||||
// Node name eg. "pluralkit-3", want to extract the 3. blame k8s :p
|
||||
int.Parse(nodeName.Split("-").Last());
|
||||
}
|
||||
Reference in New Issue
Block a user