From 76f067f86778c29fbfb3716a72bc858cfdd73fd8 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Thu, 21 Feb 2013 16:06:23 -0500 Subject: extracted more logging dependancies --- MediaBrowser.Common/Events/EventHelper.cs | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'MediaBrowser.Common/Events') diff --git a/MediaBrowser.Common/Events/EventHelper.cs b/MediaBrowser.Common/Events/EventHelper.cs index 6ed5ec591b..2bb52f0ae5 100644 --- a/MediaBrowser.Common/Events/EventHelper.cs +++ b/MediaBrowser.Common/Events/EventHelper.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Common.Logging; -using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Logging; using System; using System.Threading.Tasks; @@ -10,18 +9,14 @@ namespace MediaBrowser.Common.Events /// public static class EventHelper { - /// - /// The logger - /// - private static readonly ILogger Logger = LogManager.GetLogger("EventHelper"); - /// /// Fires the event. /// /// The handler. /// The sender. /// The instance containing the event data. - public static void QueueEventIfNotNull(EventHandler handler, object sender, EventArgs args) + /// The logger. + public static void QueueEventIfNotNull(EventHandler handler, object sender, EventArgs args, ILogger logger) { if (handler != null) { @@ -33,7 +28,7 @@ namespace MediaBrowser.Common.Events } catch (Exception ex) { - Logger.ErrorException("Error in event handler", ex); + logger.ErrorException("Error in event handler", ex); } }); } @@ -46,7 +41,8 @@ namespace MediaBrowser.Common.Events /// The handler. /// The sender. /// The args. - public static void QueueEventIfNotNull(EventHandler handler, object sender, T args) + /// The logger. + public static void QueueEventIfNotNull(EventHandler handler, object sender, T args, ILogger logger) { if (handler != null) { @@ -58,7 +54,7 @@ namespace MediaBrowser.Common.Events } catch (Exception ex) { - Logger.ErrorException("Error in event handler", ex); + logger.ErrorException("Error in event handler", ex); } }); } @@ -70,7 +66,8 @@ namespace MediaBrowser.Common.Events /// The handler. /// The sender. /// The instance containing the event data. - public static void FireEventIfNotNull(EventHandler handler, object sender, EventArgs args) + /// The logger. + public static void FireEventIfNotNull(EventHandler handler, object sender, EventArgs args, ILogger logger) { if (handler != null) { @@ -80,7 +77,7 @@ namespace MediaBrowser.Common.Events } catch (Exception ex) { - Logger.ErrorException("Error in event handler", ex); + logger.ErrorException("Error in event handler", ex); } } } @@ -92,7 +89,8 @@ namespace MediaBrowser.Common.Events /// The handler. /// The sender. /// The args. - public static void FireEventIfNotNull(EventHandler handler, object sender, T args) + /// The logger. + public static void FireEventIfNotNull(EventHandler handler, object sender, T args, ILogger logger) { if (handler != null) { @@ -102,7 +100,7 @@ namespace MediaBrowser.Common.Events } catch (Exception ex) { - Logger.ErrorException("Error in event handler", ex); + logger.ErrorException("Error in event handler", ex); } } } -- cgit v1.2.3