yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removes the usages of ILogger and ProfilerLogger since this is not for 7.3.0, will need to re-fix for 7.3 branch.

Browse Source
This commit is contained in:
Shannon
2015-03-27 14:56:12 +11:00
parent 4bdac1475f
commit ec742d1f66
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
View File

@@ -24,7 +24,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
{
private readonly IBackgroundTaskRunner<XmlCacheFilePersister> _runner;
private readonly string _xmlFileName;
private readonly ProfilingLogger _logger;
//private readonly ProfilingLogger _logger;
private readonly content _content;
private readonly ManualResetEventSlim _latch = new ManualResetEventSlim(false);
private readonly object _locko = new object();
@@ -38,12 +38,12 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
// save the cache when the app goes down
public bool RunsOnShutdown { get { return true; } }
public XmlCacheFilePersister(IBackgroundTaskRunner<XmlCacheFilePersister> runner, content content, string xmlFileName, ProfilingLogger logger, bool touched = false)
public XmlCacheFilePersister(IBackgroundTaskRunner<XmlCacheFilePersister> runner, content content, string xmlFileName, /*ProfilingLogger logger, */bool touched = false)
{
_runner = runner;
_content = content;
_xmlFileName = xmlFileName;
_logger = logger;
//_logger = logger;
if (touched == false) return;
@@ -65,7 +65,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
LogHelper.Debug<XmlCacheFilePersister>("Touched, was released, create new.");
// released, has run or is running, too late, add & return a new task
var persister = new XmlCacheFilePersister(_runner, _content, _xmlFileName, _logger, true);
var persister = new XmlCacheFilePersister(_runner, _content, _xmlFileName, /*_logger, */true);
_runner.Add(persister);
return persister;
}
@@ -149,7 +149,8 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
{
if (xmlDoc != null)
{
using (_logger.DebugDuration<XmlCacheFilePersister>(
//using (_logger.DebugDuration<XmlCacheFilePersister>(
using(DisposableTimer.DebugDuration<XmlCacheFilePersister>(
string.Format("Saving content to disk on thread '{0}' (Threadpool? {1})", Thread.CurrentThread.Name, Thread.CurrentThread.IsThreadPoolThread),
string.Format("Saved content to disk on thread '{0}' (Threadpool? {1})", Thread.CurrentThread.Name, Thread.CurrentThread.IsThreadPoolThread)))
{

4
src/Umbraco.Web/umbraco.presentation/content.cs
View File

@@ -39,8 +39,8 @@ namespace umbraco
private content()
{
_persisterTask = new XmlCacheFilePersister(FilePersister, this, UmbracoXmlDiskCacheFileName,
new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler));
_persisterTask = new XmlCacheFilePersister(FilePersister, this, UmbracoXmlDiskCacheFileName
/*,new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler)*/);
FilePersister.Add(_persisterTask);
}