Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 14:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc

Browse Source
This commit is contained in:
JustArchi
2018-04-08 05:24:21 +02:00
parent 205c6bf60b
commit 4dfaf32176
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ArchiSteamFarm/ArchiLogger.cs
View File

@@ -22,6 +22,7 @@
using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using ArchiSteamFarm.Localization;
using NLog;
@@ -37,7 +38,7 @@ namespace ArchiSteamFarm {
Logger = LogManager.GetLogger(name);
}
internal void LogFatalException(Exception exception, [CallerMemberName] string previousMethodName = null) {
internal async Task LogFatalException(Exception exception, [CallerMemberName] string previousMethodName = null) {
if (exception == null) {
LogNullError(nameof(exception));
return;
@@ -50,11 +51,37 @@ namespace ArchiSteamFarm {
return;
}
// Otherwise, if we run into fatal exception before logging module is even initialized, write exception to classic log file
File.WriteAllText(SharedInfo.LogFile, string.Format(DateTime.Now + Strings.ErrorEarlyFatalExceptionInfo + Environment.NewLine, SharedInfo.Version));
// Otherwise, we ran into fatal exception before logging module could even get initialized, so activate fallback logging that involved file and console
string message = string.Format(DateTime.Now + Strings.ErrorEarlyFatalExceptionInfo + Environment.NewLine, SharedInfo.Version);
try {
await File.WriteAllTextAsync(SharedInfo.LogFile, message).ConfigureAwait(false);
} catch {
// Ignored, we can't do anything with this
}
try {
Console.WriteLine(message);
} catch {
// Ignored, we can't do anything with this
}
while (true) {
File.AppendAllText(SharedInfo.LogFile, string.Format(Strings.ErrorEarlyFatalExceptionPrint, previousMethodName, exception.Message, exception.StackTrace));
message = string.Format(Strings.ErrorEarlyFatalExceptionPrint, previousMethodName, exception.Message, exception.StackTrace);
try {
await File.AppendAllTextAsync(SharedInfo.LogFile, message).ConfigureAwait(false);
} catch {
// Ignored, we can't do anything with this
}
try {
Console.WriteLine(message);
} catch {
// Ignored, we can't do anything with this
}
if (exception.InnerException != null) {
exception = exception.InnerException;
continue;

6
ArchiSteamFarm/Program.cs
View File

@@ -402,17 +402,17 @@ namespace ArchiSteamFarm {
return;
}
ASF.ArchiLogger.LogFatalException((Exception) e.ExceptionObject);
await ASF.ArchiLogger.LogFatalException((Exception) e.ExceptionObject).ConfigureAwait(false);
await Exit(1).ConfigureAwait(false);
}
private static void OnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e) {
private static async void OnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e) {
if (e?.Exception == null) {
ASF.ArchiLogger.LogNullError(nameof(e) + " || " + nameof(e.Exception));
return;
}
ASF.ArchiLogger.LogFatalException(e.Exception);
await ASF.ArchiLogger.LogFatalException(e.Exception).ConfigureAwait(false);
// Normally we should abort the application here, but many tasks are in fact failing in SK2 code which we can't easily fix
// Thanks Valve.