From 1175ce3f97fdebc6fdb489ce65deaac59c7b7f87 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Tue, 21 Apr 2020 07:36:22 -0600
Subject: Add Exception Middleware

---
 Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs')

diff --git a/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs b/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
index db06eb455..6c105ab65 100644
--- a/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
@@ -1,3 +1,4 @@
+using Jellyfin.Server.Middleware;
 using Microsoft.AspNetCore.Builder;
 
 namespace Jellyfin.Server.Extensions
@@ -23,5 +24,15 @@ namespace Jellyfin.Server.Extensions
                 c.SwaggerEndpoint("/swagger/v1/swagger.json", "Jellyfin API V1");
             });
         }
+
+        /// <summary>
+        /// Adds exception middleware to the application pipeline.
+        /// </summary>
+        /// <param name="applicationBuilder">The application builder.</param>
+        /// <returns>The updated application builder.</returns>
+        public static IApplicationBuilder UseExceptionMiddleware(this IApplicationBuilder applicationBuilder)
+        {
+            return applicationBuilder.UseMiddleware<ExceptionMiddleware>();
+        }
     }
 }
-- 
cgit v1.2.3


From be50fae38a27878cb520e20ed7956a72d7b05a84 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Thu, 23 Apr 2020 21:24:40 -0600
Subject: Address comments

---
 Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs | 10 ----------
 Jellyfin.Server/Startup.cs                                    |  3 ++-
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs')

diff --git a/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs b/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
index 6c105ab65..0bd654c7d 100644
--- a/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
@@ -24,15 +24,5 @@ namespace Jellyfin.Server.Extensions
                 c.SwaggerEndpoint("/swagger/v1/swagger.json", "Jellyfin API V1");
             });
         }
-
-        /// <summary>
-        /// Adds exception middleware to the application pipeline.
-        /// </summary>
-        /// <param name="applicationBuilder">The application builder.</param>
-        /// <returns>The updated application builder.</returns>
-        public static IApplicationBuilder UseExceptionMiddleware(this IApplicationBuilder applicationBuilder)
-        {
-            return applicationBuilder.UseMiddleware<ExceptionMiddleware>();
-        }
     }
 }
diff --git a/Jellyfin.Server/Startup.cs b/Jellyfin.Server/Startup.cs
index 7a632f6c4..b17357fc3 100644
--- a/Jellyfin.Server/Startup.cs
+++ b/Jellyfin.Server/Startup.cs
@@ -1,4 +1,5 @@
 using Jellyfin.Server.Extensions;
+using Jellyfin.Server.Middleware;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using Microsoft.AspNetCore.Builder;
@@ -58,7 +59,7 @@ namespace Jellyfin.Server
                 app.UseDeveloperExceptionPage();
             }
 
-            app.UseExceptionMiddleware();
+            app.UseMiddleware<ExceptionMiddleware>();
 
             app.UseWebSockets();
 
-- 
cgit v1.2.3