mirror of
https://github.com/chylex/Discord-History-Tracker.git
synced 2025-07-05 12:38:51 +02:00
Compare commits
3 Commits
45593cb140
...
895d69279f
Author | SHA1 | Date | |
---|---|---|---|
895d69279f | |||
0176fa5d53 | |||
b5a5826cf9 |
@ -69,7 +69,7 @@ sealed class Arguments {
|
|||||||
Log.Warn("Invalid concurrent downloads count: " + value);
|
Log.Warn("Invalid concurrent downloads count: " + value);
|
||||||
}
|
}
|
||||||
else if (concurrentDownloads > 10) {
|
else if (concurrentDownloads > 10) {
|
||||||
Log.Warn("Limiting concurrent downloads to 10");
|
Log.Warn("Limiting concurrent downloads to 10.");
|
||||||
ConcurrentDownloads = 10;
|
ConcurrentDownloads = 10;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -52,7 +52,7 @@ static class DatabaseGui {
|
|||||||
} catch (DatabaseTooNewException ex) {
|
} catch (DatabaseTooNewException ex) {
|
||||||
await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' was opened in a newer version of DHT (database version " + ex.DatabaseVersion + ", app version " + ex.CurrentVersion + ").");
|
await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' was opened in a newer version of DHT (database version " + ex.DatabaseVersion + ", app version " + ex.CurrentVersion + ").");
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
Log.Error(ex);
|
Log.Error("Could not open database file: " + path, ex);
|
||||||
await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be opened:" + ex.Message);
|
await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be opened:" + ex.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,8 +42,7 @@ static class DiscordAppSettings {
|
|||||||
JsonObject settingsJson = await ReadSettingsJson();
|
JsonObject settingsJson = await ReadSettingsJson();
|
||||||
return AreDevToolsEnabled(settingsJson);
|
return AreDevToolsEnabled(settingsJson);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error("Cannot read settings file.");
|
Log.Error("Could not read settings file.", e);
|
||||||
Log.Error(e);
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -62,7 +61,7 @@ static class DiscordAppSettings {
|
|||||||
} catch (JsonException) {
|
} catch (JsonException) {
|
||||||
return SettingsJsonResult.InvalidJson;
|
return SettingsJsonResult.InvalidJson;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not read settings file.", e);
|
||||||
return SettingsJsonResult.ReadError;
|
return SettingsJsonResult.ReadError;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -84,16 +83,14 @@ static class DiscordAppSettings {
|
|||||||
|
|
||||||
await WriteSettingsJson(json);
|
await WriteSettingsJson(json);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error("An error occurred when writing settings file.");
|
Log.Error("Could not write settings file.", e);
|
||||||
Log.Error(e);
|
|
||||||
|
|
||||||
if (File.Exists(JsonBackupFilePath)) {
|
if (File.Exists(JsonBackupFilePath)) {
|
||||||
try {
|
try {
|
||||||
File.Move(JsonBackupFilePath, JsonFilePath, overwrite: true);
|
File.Move(JsonBackupFilePath, JsonFilePath, overwrite: true);
|
||||||
Log.Info("Restored settings file from backup.");
|
Log.Info("Restored settings file from backup.");
|
||||||
} catch (Exception e2) {
|
} catch (Exception e2) {
|
||||||
Log.Error("Cannot restore settings file from backup.");
|
Log.Error("Could not restore settings file from backup.", e2);
|
||||||
Log.Error(e2);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -103,8 +100,7 @@ static class DiscordAppSettings {
|
|||||||
try {
|
try {
|
||||||
File.Delete(JsonBackupFilePath);
|
File.Delete(JsonBackupFilePath);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error("Cannot delete backup file.");
|
Log.Error("Could not delete backup file.", e);
|
||||||
Log.Error(e);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return SettingsJsonResult.Success;
|
return SettingsJsonResult.Success;
|
||||||
|
@ -109,8 +109,7 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
|
|||||||
await setter.Set(SettingsKey.DownloadsMaximumSizeUnit, settings.MaximumSizeUnit.Name);
|
await setter.Set(SettingsKey.DownloadsMaximumSizeUnit, settings.MaximumSizeUnit.Name);
|
||||||
});
|
});
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error("Could not save download filter settings");
|
Log.Error("Could not save download filter settings.", e);
|
||||||
Log.Error(e);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ sealed partial class ServerConfigurationPanelModel : IDisposable {
|
|||||||
try {
|
try {
|
||||||
await server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
|
await server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not start internal server.", e);
|
||||||
await Dialog.ShowOk(window, "Internal Server Error", e.Message);
|
await Dialog.ShowOk(window, "Internal Server Error", e.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -76,7 +76,7 @@ sealed partial class ServerConfigurationPanelModel : IDisposable {
|
|||||||
try {
|
try {
|
||||||
await server.Stop();
|
await server.Stop();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not stop internal server.", e);
|
||||||
await Dialog.ShowOk(window, "Internal Server Error", e.Message);
|
await Dialog.ShowOk(window, "Internal Server Error", e.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,14 +89,21 @@ sealed partial class MainWindowModel : IAsyncDisposable {
|
|||||||
try {
|
try {
|
||||||
await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
|
await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
Log.Error(ex);
|
Log.Error("Could not start internal server.", ex);
|
||||||
await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
|
await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
mainContentScreenModel = new MainContentScreenModel(window, state);
|
mainContentScreenModel = new MainContentScreenModel(window, state);
|
||||||
mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
|
mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
|
||||||
|
|
||||||
await mainContentScreenModel.Initialize();
|
await mainContentScreenModel.Initialize();
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Log.Error("Could not initialize content screen.", ex);
|
||||||
|
await Dialog.ShowOk(window, "Initialization Error", ex.Message);
|
||||||
|
await DisposeContent();
|
||||||
|
await DisposeState();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
|
Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
|
||||||
CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
|
CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
|
||||||
|
@ -84,7 +84,7 @@ sealed class DatabasePageModel {
|
|||||||
try {
|
try {
|
||||||
result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
|
result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not merge databases.", e);
|
||||||
await Dialog.ShowOk(window, Title, "Could not merge databases: " + e.Message);
|
await Dialog.ShowOk(window, Title, "Could not merge databases: " + e.Message);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -160,7 +160,7 @@ sealed class DatabasePageModel {
|
|||||||
try {
|
try {
|
||||||
result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
|
result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not import legacy archives.", e);
|
||||||
await Dialog.ShowOk(window, Title, "Could not import legacy archives: " + e.Message);
|
await Dialog.ShowOk(window, Title, "Could not import legacy archives: " + e.Message);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -236,7 +236,7 @@ sealed class DatabasePageModel {
|
|||||||
++successful;
|
++successful;
|
||||||
}
|
}
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
Log.Error(ex);
|
Log.Error("Could not import file: " + path, ex);
|
||||||
await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
|
await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -302,7 +302,7 @@ sealed class DatabasePageModel {
|
|||||||
try {
|
try {
|
||||||
await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => Db.Vacuum());
|
await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => Db.Vacuum());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not vacuum database.", e);
|
||||||
await Dialog.ShowOk(window, Title, "Could not vacuum database: " + e.Message);
|
await Dialog.ShowOk(window, Title, "Could not vacuum database: " + e.Message);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -92,7 +92,12 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
|
|||||||
await FilterModel.Initialize();
|
await FilterModel.Initialize();
|
||||||
|
|
||||||
if (await state.Db.Settings.Get(SettingsKey.DownloadsAutoStart, defaultValue: false)) {
|
if (await state.Db.Settings.Get(SettingsKey.DownloadsAutoStart, defaultValue: false)) {
|
||||||
|
try {
|
||||||
await StartDownload();
|
await StartDownload();
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.Error("Could not automatically start downloads.", e);
|
||||||
|
await Dialog.ShowOk(window, "Database Error", "Could not automatically start downloads: " + e.Message);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -111,23 +116,43 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
|
|||||||
|
|
||||||
public async Task OnClickToggleDownload() {
|
public async Task OnClickToggleDownload() {
|
||||||
IsToggleDownloadButtonEnabled = false;
|
IsToggleDownloadButtonEnabled = false;
|
||||||
|
try {
|
||||||
if (IsDownloading) {
|
if (IsDownloading) {
|
||||||
await StopDownload();
|
await StopDownload();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
try {
|
||||||
await StartDownload();
|
await StartDownload();
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.Error("Could not start downloads.", e);
|
||||||
|
await Dialog.ShowOk(window, "Database Error", "Could not start downloads: " + e.Message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
await state.Db.Settings.Set(SettingsKey.DownloadsAutoStart, IsDownloading);
|
await state.Db.Settings.Set(SettingsKey.DownloadsAutoStart, IsDownloading);
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.Error("Could not update auto-start setting in database.", e);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
IsToggleDownloadButtonEnabled = true;
|
IsToggleDownloadButtonEnabled = true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private async Task StartDownload() {
|
private async Task StartDownload() {
|
||||||
await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
|
await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
|
||||||
|
|
||||||
IObservable<DownloadItem> finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
|
try {
|
||||||
|
currentDownloadFilter = FilterModel.CreateFilter();
|
||||||
|
IObservable<DownloadItem> finishedItems = await state.Downloader.Start(currentDownloadFilter);
|
||||||
finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
|
finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
|
||||||
|
} catch (Exception) {
|
||||||
|
finishedItemsSubscription?.Dispose();
|
||||||
|
finishedItemsSubscription = null;
|
||||||
|
currentDownloadFilter = null;
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
|
||||||
OnDownloadStateChanged();
|
OnDownloadStateChanged();
|
||||||
}
|
}
|
||||||
@ -138,8 +163,8 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
|
|||||||
|
|
||||||
finishedItemsSubscription?.Dispose();
|
finishedItemsSubscription?.Dispose();
|
||||||
finishedItemsSubscription = null;
|
finishedItemsSubscription = null;
|
||||||
|
|
||||||
currentDownloadFilter = null;
|
currentDownloadFilter = null;
|
||||||
|
|
||||||
OnDownloadStateChanged();
|
OnDownloadStateChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -155,12 +180,12 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
|
|||||||
|
|
||||||
public async Task OnClickRetryFailed() {
|
public async Task OnClickRetryFailed() {
|
||||||
IsRetryingFailedDownloads = true;
|
IsRetryingFailedDownloads = true;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await state.Db.Downloads.RetryFailed();
|
await state.Db.Downloads.RetryFailed();
|
||||||
RecomputeDownloadStatistics();
|
RecomputeDownloadStatistics();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not retry failed downloads.", e);
|
||||||
|
await Dialog.ShowOk(window, "Retry Failed", "Could not retry failed downloads: " + e.Message);
|
||||||
} finally {
|
} finally {
|
||||||
IsRetryingFailedDownloads = false;
|
IsRetryingFailedDownloads = false;
|
||||||
}
|
}
|
||||||
@ -212,7 +237,7 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
|
|||||||
await state.Db.Vacuum();
|
await state.Db.Vacuum();
|
||||||
});
|
});
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not delete orphaned downloads.", e);
|
||||||
await Dialog.ShowOk(window, Title, "Could not delete orphaned downloads: " + e.Message);
|
await Dialog.ShowOk(window, Title, "Could not delete orphaned downloads: " + e.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -239,7 +264,7 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
|
|||||||
return await exporter.Export(new ExportProgressReporter(callback));
|
return await exporter.Export(new ExportProgressReporter(callback));
|
||||||
});
|
});
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not export downloaded files.", e);
|
||||||
await Dialog.ShowOk(window, Title, "Could not export downloaded files: " + e.Message);
|
await Dialog.ShowOk(window, Title, "Could not export downloaded files: " + e.Message);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -146,7 +146,7 @@ sealed partial class TrackingPageModel {
|
|||||||
await clipboard.SetTextAsync(script);
|
await clipboard.SetTextAsync(script);
|
||||||
return true;
|
return true;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not copy to clipboard.", e);
|
||||||
await Dialog.ShowOk(window, errorDialogTitle, "An error occurred while copying to clipboard.");
|
await Dialog.ShowOk(window, errorDialogTitle, "An error occurred while copying to clipboard.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -75,7 +75,7 @@ sealed partial class ViewerPageModel : IDisposable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not apply filters.", e);
|
||||||
await Dialog.ShowOk(window, "Apply Filters", "Could not apply filters: " + e.Message);
|
await Dialog.ShowOk(window, "Apply Filters", "Could not apply filters: " + e.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -131,7 +131,7 @@ sealed partial class WelcomeScreenModel {
|
|||||||
await Dialog.ShowOk(window, "Check Updates", "Request timed out.");
|
await Dialog.ShowOk(window, "Check Updates", "Request timed out.");
|
||||||
return;
|
return;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not check for updates.", e);
|
||||||
await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
|
await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -67,7 +67,7 @@ class DISCORD {
|
|||||||
/**
|
/**
|
||||||
* @type {function(String): MessageData}
|
* @type {function(String): MessageData}
|
||||||
*/
|
*/
|
||||||
static #getMessages = WEBPACK.findFunction("getMessages");
|
static #getMessages = WEBPACK.findFunction("getMessages", [ "isLoadingMessages" ]);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {function(String): void}
|
* @type {function(String): void}
|
||||||
|
@ -88,7 +88,7 @@ class WEBPACK {
|
|||||||
return modules[0];
|
return modules[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
console.error("[DHT] Cannot find module " + name + ", results found:", modules.length);
|
console.error("[DHT] Cannot find module " + name + ", results found:", modules.length, modules);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -95,7 +95,7 @@ public sealed partial class DownloadExporter(IDatabaseFile db, string folderPath
|
|||||||
} catch (FileAlreadyExistsException) {
|
} catch (FileAlreadyExistsException) {
|
||||||
success = false;
|
success = false;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not export downloaded file: " + download.NormalizedUrl, e);
|
||||||
success = false;
|
success = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Net;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using System.Reactive.Subjects;
|
using System.Reactive.Subjects;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
@ -94,12 +95,10 @@ sealed class DownloaderTask : IAsyncDisposable {
|
|||||||
} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
|
} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
|
||||||
await db.Downloads.AddDownload(item.ToFailure(), stream: null);
|
await db.Downloads.AddDownload(item.ToFailure(), stream: null);
|
||||||
log.Error("Download timed out: " + item.DownloadUrl);
|
log.Error("Download timed out: " + item.DownloadUrl);
|
||||||
} catch (HttpRequestException e) {
|
|
||||||
await db.Downloads.AddDownload(item.ToFailure(e.StatusCode), stream: null);
|
|
||||||
log.Error(e);
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
await db.Downloads.AddDownload(item.ToFailure(), stream: null);
|
HttpStatusCode? statusCode = e is HttpRequestException hre ? hre.StatusCode : null;
|
||||||
log.Error(e);
|
await db.Downloads.AddDownload(item.ToFailure(statusCode), stream: null);
|
||||||
|
log.Error("Could not download file: " + item.DownloadUrl, e);
|
||||||
} finally {
|
} finally {
|
||||||
try {
|
try {
|
||||||
finishedItemPublisher.OnNext(item);
|
finishedItemPublisher.OnNext(item);
|
||||||
|
@ -33,7 +33,7 @@ abstract class BaseEndpoint {
|
|||||||
await response.WriteAsync(e.Message);
|
await response.WriteAsync(e.Message);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.Error(e);
|
Log.Error("Could not handle request.", e);
|
||||||
response.StatusCode = (int) HttpStatusCode.InternalServerError;
|
response.StatusCode = (int) HttpStatusCode.InternalServerError;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -30,11 +30,11 @@ sealed class ServerLoggingMiddleware(RequestDelegate next) {
|
|||||||
long elapsedMs = stopwatch.ElapsedMilliseconds;
|
long elapsedMs = stopwatch.ElapsedMilliseconds;
|
||||||
|
|
||||||
if (context.RequestAborted.IsCancellationRequested) {
|
if (context.RequestAborted.IsCancellationRequested) {
|
||||||
Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) was cancelled after " + elapsedMs + " ms");
|
Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) was cancelled after " + elapsedMs + " ms.");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
int responseStatus = context.Response.StatusCode;
|
int responseStatus = context.Response.StatusCode;
|
||||||
Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) returned " + responseStatus + ", took " + elapsedMs + " ms");
|
Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) returned " + responseStatus + ", took " + elapsedMs + " ms.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -88,7 +88,7 @@ public sealed class ServerManager {
|
|||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
|
||||||
Log.Info("Server started");
|
Log.Info("Server started.");
|
||||||
|
|
||||||
server = newServer;
|
server = newServer;
|
||||||
|
|
||||||
@ -104,7 +104,7 @@ public sealed class ServerManager {
|
|||||||
|
|
||||||
Log.Info("Stopping server...");
|
Log.Info("Stopping server...");
|
||||||
await server.StopAsync();
|
await server.StopAsync();
|
||||||
Log.Info("Server stopped");
|
Log.Info("Server stopped.");
|
||||||
|
|
||||||
server.Dispose();
|
server.Dispose();
|
||||||
server = null;
|
server = null;
|
||||||
|
@ -88,6 +88,11 @@ public sealed class Log {
|
|||||||
LogLevel(ConsoleColor.Red, "ERROR", e.ToString());
|
LogLevel(ConsoleColor.Red, "ERROR", e.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Error(string message, Exception e) {
|
||||||
|
Error(message);
|
||||||
|
Error(e);
|
||||||
|
}
|
||||||
|
|
||||||
public Perf Start(string? context = null, [CallerMemberName] string callerMemberName = "") {
|
public Perf Start(string? context = null, [CallerMemberName] string callerMemberName = "") {
|
||||||
return Perf.Start(this, context, callerMemberName);
|
return Perf.Start(this, context, callerMemberName);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user