From 2f1996b7730726f465c6495ba96e3622587167d0 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 20 Jan 2016 14:54:06 -0500 Subject: [PATCH] resolve config caching issue --- MediaBrowser.Api/BaseApiService.cs | 15 --------------- MediaBrowser.Api/ConfigurationService.cs | 8 +------- MediaBrowser.Api/PluginService.cs | 6 +----- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index ecab943491..c3b0314480 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -58,21 +58,6 @@ namespace MediaBrowser.Api return ResultFactory.GetOptimizedResult(Request, result); } - /// - /// To the optimized result using cache. - /// - /// - /// The cache key. - /// The last date modified. - /// Duration of the cache. - /// The factory function. - /// System.Object. - protected object ToOptimizedResultUsingCache(Guid cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration, Func factoryFn) - where T : class - { - return ResultFactory.GetOptimizedResultUsingCache(Request, cacheKey, lastDateModified, cacheDuration, factoryFn); - } - protected void AssertCanUpdateUser(IUserManager userManager, string userId) { var auth = AuthorizationContext.GetAuthorizationInfo(Request); diff --git a/MediaBrowser.Api/ConfigurationService.cs b/MediaBrowser.Api/ConfigurationService.cs index f33a30892a..3c0b7f1402 100644 --- a/MediaBrowser.Api/ConfigurationService.cs +++ b/MediaBrowser.Api/ConfigurationService.cs @@ -105,13 +105,7 @@ namespace MediaBrowser.Api /// System.Object. public object Get(GetConfiguration request) { - var configPath = _configurationManager.ApplicationPaths.SystemConfigurationFilePath; - - var dateModified = _fileSystem.GetLastWriteTimeUtc(configPath); - - var cacheKey = (configPath + dateModified.Ticks).GetMD5(); - - return ToOptimizedResultUsingCache(cacheKey, dateModified, null, () => _configurationManager.Configuration); + return ToOptimizedResult(_configurationManager.Configuration); } public object Get(GetNamedConfiguration request) diff --git a/MediaBrowser.Api/PluginService.cs b/MediaBrowser.Api/PluginService.cs index 74b37df92f..2d7444f60f 100644 --- a/MediaBrowser.Api/PluginService.cs +++ b/MediaBrowser.Api/PluginService.cs @@ -250,11 +250,7 @@ namespace MediaBrowser.Api var guid = new Guid(request.Id); var plugin = _appHost.Plugins.First(p => p.Id == guid); - var dateModified = plugin.ConfigurationDateLastModified; - - var cacheKey = (plugin.Version.ToString() + dateModified.Ticks).GetMD5(); - - return ToOptimizedResultUsingCache(cacheKey, dateModified, null, () => plugin.Configuration); + return ToOptimizedResult(plugin.Configuration); } ///