starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-19 07:23:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

removed static logger

Browse Source
This commit is contained in:
LukePulverenti
2013-02-21 15:26:35 -05:00
parent 4019b9260b
commit ab1065a567
46 changed files with 424 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.Common/Serialization/XmlSerializer.cs
View File

@@ -3,6 +3,7 @@ using System;
using System.IO;
using System.Linq;
using System.Xml;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Common.Serialization
{
@@ -157,10 +158,11 @@ namespace MediaBrowser.Common.Serialization
/// </summary>
/// <param name="type">The type.</param>
/// <param name="path">The path.</param>
/// <param name="logger">The logger.</param>
/// <returns>System.Object.</returns>
public static object GetXmlConfiguration(Type type, string path)
public static object GetXmlConfiguration(Type type, string path, ILogger logger)
{
Logger.LogInfo("Loading {0} at {1}", type.Name, path);
logger.Info("Loading {0} at {1}", type.Name, path);
object configuration;
@@ -184,7 +186,7 @@ namespace MediaBrowser.Common.Serialization
// If the file didn't exist before, or if something has changed, re-save
if (buffer == null || !buffer.SequenceEqual(newBytes))
{
Logger.LogInfo("Saving {0} to {1}", type.Name, path);
logger.Info("Saving {0} to {1}", type.Name, path);
// Save it after load in case we got new items
File.WriteAllBytes(path, newBytes);
@@ -200,11 +202,12 @@ namespace MediaBrowser.Common.Serialization
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="path">The path.</param>
/// <param name="logger">The logger.</param>
/// <returns>``0.</returns>
public static T GetXmlConfiguration<T>(string path)
public static T GetXmlConfiguration<T>(string path, ILogger logger)
where T : class
{
return GetXmlConfiguration(typeof(T), path) as T;
return GetXmlConfiguration(typeof(T), path, logger) as T;
}
}
}