aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/EntryPoints
diff options
context:
space:
mode:
Diffstat (limited to 'Emby.Server.Implementations/EntryPoints')
-rw-r--r--Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs4
-rw-r--r--Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs6
-rw-r--r--Emby.Server.Implementations/EntryPoints/KeepServerAwake.cs2
-rw-r--r--Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs4
-rw-r--r--Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs2
-rw-r--r--Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs12
-rw-r--r--Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs2
-rw-r--r--Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs4
8 files changed, 15 insertions, 21 deletions
diff --git a/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
index cd5fca40d..a0947c87d 100644
--- a/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
+++ b/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
@@ -73,7 +73,7 @@ namespace Emby.Server.Implementations.EntryPoints
}
catch (Exception ex)
{
- _logger.LogError("Error restarting server", ex);
+ _logger.LogError(ex, "Error restarting server");
}
}
}
@@ -98,7 +98,7 @@ namespace Emby.Server.Implementations.EntryPoints
}
catch (Exception ex)
{
- _logger.LogError("Error getting timers", ex);
+ _logger.LogError(ex, "Error getting timers");
}
}
diff --git a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
index 46fbc94fd..a95e21e1c 100644
--- a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
@@ -216,7 +216,7 @@ namespace Emby.Server.Implementations.EntryPoints
catch
{
// Commenting out because users are reporting problems out of our control
- //_logger.LogError("Error creating port forwarding rules", ex);
+ //_logger.LogError(ex, "Error creating port forwarding rules");
}
}
@@ -253,6 +253,7 @@ namespace Emby.Server.Implementations.EntryPoints
}
catch (Exception ex)
{
+ _logger.LogError(ex, "Error creating http port map");
return;
}
@@ -262,6 +263,7 @@ namespace Emby.Server.Implementations.EntryPoints
}
catch (Exception ex)
{
+ _logger.LogError(ex, "Error creating https port map");
}
}
@@ -309,7 +311,7 @@ namespace Emby.Server.Implementations.EntryPoints
}
catch (Exception ex)
{
- _logger.LogError("Error stopping NAT Discovery", ex);
+ _logger.LogError(ex, "Error stopping NAT Discovery");
}
}
}
diff --git a/Emby.Server.Implementations/EntryPoints/KeepServerAwake.cs b/Emby.Server.Implementations/EntryPoints/KeepServerAwake.cs
index a9121ba32..a6dadcef0 100644
--- a/Emby.Server.Implementations/EntryPoints/KeepServerAwake.cs
+++ b/Emby.Server.Implementations/EntryPoints/KeepServerAwake.cs
@@ -49,7 +49,7 @@ namespace Emby.Server.Implementations.EntryPoints
}
catch (Exception ex)
{
- _logger.LogError("Error resetting system standby timer", ex);
+ _logger.LogError(ex, "Error resetting system standby timer");
}
}
diff --git a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
index ff283667b..bb8ef52f1 100644
--- a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -331,7 +331,7 @@ namespace Emby.Server.Implementations.EntryPoints
}
catch (Exception ex)
{
- _logger.LogError("Error in GetLibraryUpdateInfo", ex);
+ _logger.LogError(ex, "Error in GetLibraryUpdateInfo");
return;
}
@@ -346,7 +346,7 @@ namespace Emby.Server.Implementations.EntryPoints
}
catch (Exception ex)
{
- _logger.LogError("Error sending LibraryChanged message", ex);
+ _logger.LogError(ex, "Error sending LibraryChanged message");
}
}
}
diff --git a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
index 24cd659e1..0b377dc68 100644
--- a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
@@ -66,7 +66,7 @@ namespace Emby.Server.Implementations.EntryPoints
}
catch (Exception ex)
{
- _logger.LogError("Error sending message", ex);
+ _logger.LogError(ex, "Error sending message");
}
}
diff --git a/Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs b/Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
index f6a74c4ec..72dcabab3 100644
--- a/Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
@@ -157,13 +157,9 @@ namespace Emby.Server.Implementations.EntryPoints
{
await _sessionManager.SendMessageToAdminSessions(name, data, CancellationToken.None);
}
- catch (ObjectDisposedException)
- {
-
- }
catch (Exception)
{
- //Logger.LogError("Error sending message", ex);
+
}
}
@@ -173,13 +169,9 @@ namespace Emby.Server.Implementations.EntryPoints
{
await _sessionManager.SendMessageToUserSessions(new List<Guid> { user.Id }, name, data, CancellationToken.None);
}
- catch (ObjectDisposedException)
- {
-
- }
catch (Exception)
{
- //Logger.LogError("Error sending message", ex);
+
}
}
diff --git a/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
index 1bb11ce40..f8e2d32dd 100644
--- a/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
+++ b/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
@@ -58,7 +58,7 @@ namespace Emby.Server.Implementations.EntryPoints
}
catch (Exception ex)
{
- _logger.LogError("Failed to start UDP Server", ex);
+ _logger.LogError(ex, "Failed to start UDP Server");
}
}
diff --git a/Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs
index ca79262b0..f7542a5e9 100644
--- a/Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs
+++ b/Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs
@@ -91,7 +91,7 @@ namespace Emby.Server.Implementations.EntryPoints
}
catch (Exception ex)
{
- //_logger.LogError("Error sending anonymous usage statistics.", ex);
+ _logger.LogError(ex, "Error sending anonymous usage statistics.");
}
}
@@ -119,7 +119,7 @@ namespace Emby.Server.Implementations.EntryPoints
}
catch (Exception ex)
{
- //_logger.LogError("Error sending anonymous usage statistics.", ex);
+ _logger.LogError(ex, "Error sending anonymous usage statistics.");
}
}