From 6f7d289feb6940afe1a266e8cec89c67b3b196ab Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Sat, 15 Aug 2020 15:55:58 -0400
Subject: Create EventManager

---
 .../Events/EventManager.cs                         | 49 ++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 Jellyfin.Server.Implementations/Events/EventManager.cs

(limited to 'Jellyfin.Server.Implementations/Events/EventManager.cs')

diff --git a/Jellyfin.Server.Implementations/Events/EventManager.cs b/Jellyfin.Server.Implementations/Events/EventManager.cs
new file mode 100644
index 000000000..d79b73106
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Events/EventManager.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Threading.Tasks;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Events;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Jellyfin.Server.Implementations.Events
+{
+    /// <summary>
+    /// Handles the firing of events.
+    /// </summary>
+    public class EventManager : IEventManager
+    {
+        private readonly IServerApplicationHost _appHost;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventManager"/> class.
+        /// </summary>
+        /// <param name="appHost">The application host.</param>
+        public EventManager(IServerApplicationHost appHost)
+        {
+            _appHost = appHost;
+        }
+
+        /// <inheritdoc />
+        public void Publish<T>(T eventArgs)
+            where T : EventArgs
+        {
+            Task.WaitAll(PublishInternal(eventArgs));
+        }
+
+        /// <inheritdoc />
+        public async Task PublishAsync<T>(T eventArgs)
+            where T : EventArgs
+        {
+            await PublishInternal(eventArgs).ConfigureAwait(false);
+        }
+
+        private async Task PublishInternal<T>(T eventArgs)
+            where T : EventArgs
+        {
+            using var scope = _appHost.ServiceProvider.CreateScope();
+            foreach (var service in scope.ServiceProvider.GetServices<IEventConsumer<T>>())
+            {
+                await service.OnEvent(eventArgs).ConfigureAwait(false);
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From b2f734efd127c04815d0a4799dd20449b96c501b Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Sat, 15 Aug 2020 18:36:37 -0400
Subject: Gracefully handle exceptions in IEventConsumers

---
 Jellyfin.Server.Implementations/Events/EventManager.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'Jellyfin.Server.Implementations/Events/EventManager.cs')

diff --git a/Jellyfin.Server.Implementations/Events/EventManager.cs b/Jellyfin.Server.Implementations/Events/EventManager.cs
index d79b73106..707002442 100644
--- a/Jellyfin.Server.Implementations/Events/EventManager.cs
+++ b/Jellyfin.Server.Implementations/Events/EventManager.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Events;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace Jellyfin.Server.Implementations.Events
 {
@@ -11,14 +12,17 @@ namespace Jellyfin.Server.Implementations.Events
     /// </summary>
     public class EventManager : IEventManager
     {
+        private readonly ILogger<EventManager> _logger;
         private readonly IServerApplicationHost _appHost;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="EventManager"/> class.
         /// </summary>
+        /// <param name="logger">The logger.</param>
         /// <param name="appHost">The application host.</param>
-        public EventManager(IServerApplicationHost appHost)
+        public EventManager(ILogger<EventManager> logger, IServerApplicationHost appHost)
         {
+            _logger = logger;
             _appHost = appHost;
         }
 
@@ -42,7 +46,14 @@ namespace Jellyfin.Server.Implementations.Events
             using var scope = _appHost.ServiceProvider.CreateScope();
             foreach (var service in scope.ServiceProvider.GetServices<IEventConsumer<T>>())
             {
-                await service.OnEvent(eventArgs).ConfigureAwait(false);
+                try
+                {
+                    await service.OnEvent(eventArgs).ConfigureAwait(false);
+                }
+                catch (Exception e)
+                {
+                    _logger.LogError(e, "Uncaught exception in EventConsumer {type}: ", service.GetType());
+                }
             }
         }
     }
-- 
cgit v1.2.3