ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: new code style in EntryPoint.cs

Browse source
This commit is contained in:
goat 2021-03-31 15:19:25 +02:00
parent 115fa54957
commit a8d2a577b9
1 changed files with 43 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Dalamud/EntryPoint.cs
View file

@ -3,26 +3,45 @@ using System.IO;
using System.Net;
using System.Threading;
using System.Threading.Tasks;
using Dalamud.Interface;
using EasyHook;
using Serilog;
using Serilog.Core;
using Serilog.Events;
namespace Dalamud {
public sealed class EntryPoint : IEntryPoint {
public EntryPoint(RemoteHooking.IContext ctx, DalamudStartInfo info) {
namespace Dalamud
{
/// <summary>
/// The main entrypoint for the Dalamud system.
/// </summary>
public sealed class EntryPoint : IEntryPoint
{
/// <summary>
/// Initializes a new instance of the <see cref="EntryPoint"/> class.
/// </summary>
/// <param name="ctx">The <see cref="RemoteHooking.IContext"/> used to load the DLL.</param>
/// <param name="info">The <see cref="DalamudStartInfo"/> containing information needed to initialize Dalamud.</param>
public EntryPoint(RemoteHooking.IContext ctx, DalamudStartInfo info)
{
// Required by EasyHook
}
public void Run(RemoteHooking.IContext ctx, DalamudStartInfo info) {
/// <summary>
/// Initialize all Dalamud subsystems and start running on the main thread.
/// </summary>
/// <param name="ctx">The <see cref="RemoteHooking.IContext"/> used to load the DLL.</param>
/// <param name="info">The <see cref="DalamudStartInfo"/> containing information needed to initialize Dalamud.</param>
public void Run(RemoteHooking.IContext ctx, DalamudStartInfo info)
{
// Setup logger
var (logger, levelSwitch) = NewLogger(info.WorkingDirectory);
var (logger, levelSwitch) = this.NewLogger(info.WorkingDirectory);
Log.Logger = logger;
var finishSignal = new ManualResetEvent(false);
try {
try
{
Log.Information(new string('-', 80));
Log.Information("Initializing a session..");
@ -31,8 +50,8 @@ namespace Dalamud {
SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls | SecurityProtocolType.Ssl3;
// Log any unhandled exception.
AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
TaskScheduler.UnobservedTaskException += OnUnobservedTaskException;
AppDomain.CurrentDomain.UnhandledException += this.OnUnhandledException;
TaskScheduler.UnobservedTaskException += this.OnUnobservedTaskException;
var dalamud = new Dalamud(info, levelSwitch, finishSignal);
Log.Information("Starting a session..");
@ -42,10 +61,14 @@ namespace Dalamud {
dalamud.WaitForUnload();
dalamud.Dispose();
} catch (Exception ex) {
}
catch (Exception ex)
{
Log.Fatal(ex, "Unhandled exception on main thread.");
} finally {
AppDomain.CurrentDomain.UnhandledException -= OnUnhandledException;
}
finally
{
AppDomain.CurrentDomain.UnhandledException -= this.OnUnhandledException;
Log.Information("Session has ended.");
Log.CloseAndFlush();
@ -54,7 +77,8 @@ namespace Dalamud {
}
}
private (Logger logger, LoggingLevelSwitch levelSwitch) NewLogger(string baseDirectory) {
private (Logger logger, LoggingLevelSwitch levelSwitch) NewLogger(string baseDirectory)
{
#if DEBUG
var logPath = Path.Combine(baseDirectory, "dalamud.log");
#else
@ -78,8 +102,10 @@ namespace Dalamud {
return (newLogger, levelSwitch);
}
private void OnUnhandledException(object sender, UnhandledExceptionEventArgs arg) {
switch (arg.ExceptionObject) {
private void OnUnhandledException(object sender, UnhandledExceptionEventArgs arg)
{
switch (arg.ExceptionObject)
{
case Exception ex:
Log.Fatal(ex, "Unhandled exception on AppDomain");
break;