diff --git a/app/Desktop/Arguments.cs b/app/Desktop/Arguments.cs index ef6ca2f..12218e4 100644 --- a/app/Desktop/Arguments.cs +++ b/app/Desktop/Arguments.cs @@ -69,7 +69,7 @@ sealed class Arguments { Log.Warn("Invalid concurrent downloads count: " + value); } else if (concurrentDownloads > 10) { - Log.Warn("Limiting concurrent downloads to 10"); + Log.Warn("Limiting concurrent downloads to 10."); ConcurrentDownloads = 10; } else { diff --git a/app/Desktop/Common/DatabaseGui.cs b/app/Desktop/Common/DatabaseGui.cs index f1a2628..04823bf 100644 --- a/app/Desktop/Common/DatabaseGui.cs +++ b/app/Desktop/Common/DatabaseGui.cs @@ -52,7 +52,7 @@ static class DatabaseGui { } 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 + ")."); } 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); } diff --git a/app/Desktop/Discord/DiscordAppSettings.cs b/app/Desktop/Discord/DiscordAppSettings.cs index 53f5ce9..0b2c8cd 100644 --- a/app/Desktop/Discord/DiscordAppSettings.cs +++ b/app/Desktop/Discord/DiscordAppSettings.cs @@ -42,8 +42,7 @@ static class DiscordAppSettings { JsonObject settingsJson = await ReadSettingsJson(); return AreDevToolsEnabled(settingsJson); } catch (Exception e) { - Log.Error("Cannot read settings file."); - Log.Error(e); + Log.Error("Could not read settings file.", e); return null; } } @@ -62,7 +61,7 @@ static class DiscordAppSettings { } catch (JsonException) { return SettingsJsonResult.InvalidJson; } catch (Exception e) { - Log.Error(e); + Log.Error("Could not read settings file.", e); return SettingsJsonResult.ReadError; } @@ -84,16 +83,14 @@ static class DiscordAppSettings { await WriteSettingsJson(json); } catch (Exception e) { - Log.Error("An error occurred when writing settings file."); - Log.Error(e); + Log.Error("Could not write settings file.", e); if (File.Exists(JsonBackupFilePath)) { try { File.Move(JsonBackupFilePath, JsonFilePath, overwrite: true); Log.Info("Restored settings file from backup."); } catch (Exception e2) { - Log.Error("Cannot restore settings file from backup."); - Log.Error(e2); + Log.Error("Could not restore settings file from backup.", e2); } } @@ -103,8 +100,7 @@ static class DiscordAppSettings { try { File.Delete(JsonBackupFilePath); } catch (Exception e) { - Log.Error("Cannot delete backup file."); - Log.Error(e); + Log.Error("Could not delete backup file.", e); } return SettingsJsonResult.Success; diff --git a/app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs b/app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs index 6c99c71..4f8661b 100644 --- a/app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs +++ b/app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs @@ -109,8 +109,7 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable { await setter.Set(SettingsKey.DownloadsMaximumSizeUnit, settings.MaximumSizeUnit.Name); }); } catch (Exception e) { - Log.Error("Could not save download filter settings"); - Log.Error(e); + Log.Error("Could not save download filter settings.", e); } } diff --git a/app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs b/app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs index 720bb00..a7b1e25 100644 --- a/app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs +++ b/app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs @@ -62,7 +62,7 @@ sealed partial class ServerConfigurationPanelModel : IDisposable { try { await server.Start(ServerConfiguration.Port, ServerConfiguration.Token); } catch (Exception e) { - Log.Error(e); + Log.Error("Could not start internal server.", e); await Dialog.ShowOk(window, "Internal Server Error", e.Message); } @@ -76,7 +76,7 @@ sealed partial class ServerConfigurationPanelModel : IDisposable { try { await server.Stop(); } catch (Exception e) { - Log.Error(e); + Log.Error("Could not stop internal server.", e); await Dialog.ShowOk(window, "Internal Server Error", e.Message); } diff --git a/app/Desktop/Main/MainWindowModel.cs b/app/Desktop/Main/MainWindowModel.cs index 971dc15..7bb42e6 100644 --- a/app/Desktop/Main/MainWindowModel.cs +++ b/app/Desktop/Main/MainWindowModel.cs @@ -89,7 +89,7 @@ sealed partial class MainWindowModel : IAsyncDisposable { try { await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token); } catch (Exception ex) { - Log.Error(ex); + Log.Error("Could not start internal server.", ex); await Dialog.ShowOk(window, "Internal Server Error", ex.Message); } diff --git a/app/Desktop/Main/Pages/DatabasePageModel.cs b/app/Desktop/Main/Pages/DatabasePageModel.cs index fa1d510..8504247 100644 --- a/app/Desktop/Main/Pages/DatabasePageModel.cs +++ b/app/Desktop/Main/Pages/DatabasePageModel.cs @@ -84,7 +84,7 @@ sealed class DatabasePageModel { try { result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback)); } catch (Exception e) { - Log.Error(e); + Log.Error("Could not merge databases.", e); await Dialog.ShowOk(window, Title, "Could not merge databases: " + e.Message); return; } @@ -160,7 +160,7 @@ sealed class DatabasePageModel { try { result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback)); } 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); return; } @@ -236,7 +236,7 @@ sealed class DatabasePageModel { ++successful; } } 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); } } @@ -302,7 +302,7 @@ sealed class DatabasePageModel { try { await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => Db.Vacuum()); } catch (Exception e) { - Log.Error(e); + Log.Error("Could not vacuum database.", e); await Dialog.ShowOk(window, Title, "Could not vacuum database: " + e.Message); return; } diff --git a/app/Desktop/Main/Pages/DownloadsPageModel.cs b/app/Desktop/Main/Pages/DownloadsPageModel.cs index 5f6199e..42fe81a 100644 --- a/app/Desktop/Main/Pages/DownloadsPageModel.cs +++ b/app/Desktop/Main/Pages/DownloadsPageModel.cs @@ -160,7 +160,7 @@ sealed partial class DownloadsPageModel : IAsyncDisposable { await state.Db.Downloads.RetryFailed(); RecomputeDownloadStatistics(); } catch (Exception e) { - Log.Error(e); + Log.Error("Could not retry failed downloads.", e); } finally { IsRetryingFailedDownloads = false; } @@ -212,7 +212,7 @@ sealed partial class DownloadsPageModel : IAsyncDisposable { await state.Db.Vacuum(); }); } 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); } } @@ -239,7 +239,7 @@ sealed partial class DownloadsPageModel : IAsyncDisposable { return await exporter.Export(new ExportProgressReporter(callback)); }); } 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); return; } diff --git a/app/Desktop/Main/Pages/TrackingPageModel.cs b/app/Desktop/Main/Pages/TrackingPageModel.cs index 8757917..726c558 100644 --- a/app/Desktop/Main/Pages/TrackingPageModel.cs +++ b/app/Desktop/Main/Pages/TrackingPageModel.cs @@ -146,7 +146,7 @@ sealed partial class TrackingPageModel { await clipboard.SetTextAsync(script); return true; } 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."); return false; } diff --git a/app/Desktop/Main/Pages/ViewerPageModel.cs b/app/Desktop/Main/Pages/ViewerPageModel.cs index dc7c3fb..c94baa9 100644 --- a/app/Desktop/Main/Pages/ViewerPageModel.cs +++ b/app/Desktop/Main/Pages/ViewerPageModel.cs @@ -75,7 +75,7 @@ sealed partial class ViewerPageModel : IDisposable { } } } 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); } } diff --git a/app/Desktop/Main/Screens/WelcomeScreenModel.cs b/app/Desktop/Main/Screens/WelcomeScreenModel.cs index b3f0061..4530dd3 100644 --- a/app/Desktop/Main/Screens/WelcomeScreenModel.cs +++ b/app/Desktop/Main/Screens/WelcomeScreenModel.cs @@ -131,7 +131,7 @@ sealed partial class WelcomeScreenModel { await Dialog.ShowOk(window, "Check Updates", "Request timed out."); return; } 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); return; } diff --git a/app/Server/Download/DownloadExporter.cs b/app/Server/Download/DownloadExporter.cs index e72c08b..d0bb50e 100644 --- a/app/Server/Download/DownloadExporter.cs +++ b/app/Server/Download/DownloadExporter.cs @@ -95,7 +95,7 @@ public sealed partial class DownloadExporter(IDatabaseFile db, string folderPath } catch (FileAlreadyExistsException) { success = false; } catch (Exception e) { - Log.Error(e); + Log.Error("Could not export downloaded file: " + download.NormalizedUrl, e); success = false; } diff --git a/app/Server/Download/DownloaderTask.cs b/app/Server/Download/DownloaderTask.cs index 56e8c74..b381eb1 100644 --- a/app/Server/Download/DownloaderTask.cs +++ b/app/Server/Download/DownloaderTask.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Net; using System.Net.Http; using System.Reactive.Subjects; using System.Threading; @@ -94,12 +95,10 @@ sealed class DownloaderTask : IAsyncDisposable { } catch (TaskCanceledException e) when (e.InnerException is TimeoutException) { await db.Downloads.AddDownload(item.ToFailure(), stream: null); 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) { - await db.Downloads.AddDownload(item.ToFailure(), stream: null); - log.Error(e); + HttpStatusCode? statusCode = e is HttpRequestException hre ? hre.StatusCode : null; + await db.Downloads.AddDownload(item.ToFailure(statusCode), stream: null); + log.Error("Could not download file: " + item.DownloadUrl, e); } finally { try { finishedItemPublisher.OnNext(item); diff --git a/app/Server/Endpoints/BaseEndpoint.cs b/app/Server/Endpoints/BaseEndpoint.cs index 42c44b9..7557f7e 100644 --- a/app/Server/Endpoints/BaseEndpoint.cs +++ b/app/Server/Endpoints/BaseEndpoint.cs @@ -33,7 +33,7 @@ abstract class BaseEndpoint { await response.WriteAsync(e.Message); } } catch (Exception e) { - Log.Error(e); + Log.Error("Could not handle request.", e); response.StatusCode = (int) HttpStatusCode.InternalServerError; } } diff --git a/app/Server/Service/Middlewares/ServerLoggingMiddleware.cs b/app/Server/Service/Middlewares/ServerLoggingMiddleware.cs index 4a5b241..7cacb5c 100644 --- a/app/Server/Service/Middlewares/ServerLoggingMiddleware.cs +++ b/app/Server/Service/Middlewares/ServerLoggingMiddleware.cs @@ -30,11 +30,11 @@ sealed class ServerLoggingMiddleware(RequestDelegate next) { long elapsedMs = stopwatch.ElapsedMilliseconds; 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 { 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."); } } } diff --git a/app/Server/Service/ServerManager.cs b/app/Server/Service/ServerManager.cs index 84de064..5e8862c 100644 --- a/app/Server/Service/ServerManager.cs +++ b/app/Server/Service/ServerManager.cs @@ -88,7 +88,7 @@ public sealed class ServerManager { throw; } - Log.Info("Server started"); + Log.Info("Server started."); server = newServer; @@ -104,7 +104,7 @@ public sealed class ServerManager { Log.Info("Stopping server..."); await server.StopAsync(); - Log.Info("Server stopped"); + Log.Info("Server stopped."); server.Dispose(); server = null; diff --git a/app/Utils/Logging/Log.cs b/app/Utils/Logging/Log.cs index bbf481b..dfb1e31 100644 --- a/app/Utils/Logging/Log.cs +++ b/app/Utils/Logging/Log.cs @@ -88,6 +88,11 @@ public sealed class Log { 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 = "") { return Perf.Start(this, context, callerMemberName); }