aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-20 14:54:06 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-20 14:54:06 -0500
commit2f1996b7730726f465c6495ba96e3622587167d0 (patch)
tree5391a9a32434241a78f7f89de11f4f5f55c3fa6b
parent35e48e4990326c099ef2043fa1c64232203cd3a0 (diff)
resolve config caching issue
-rw-r--r--MediaBrowser.Api/BaseApiService.cs15
-rw-r--r--MediaBrowser.Api/ConfigurationService.cs8
-rw-r--r--MediaBrowser.Api/PluginService.cs6
3 files changed, 2 insertions, 27 deletions
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index ecab94349..c3b031448 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -58,21 +58,6 @@ namespace MediaBrowser.Api
return ResultFactory.GetOptimizedResult(Request, result);
}
- /// <summary>
- /// To the optimized result using cache.
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <param name="cacheKey">The cache key.</param>
- /// <param name="lastDateModified">The last date modified.</param>
- /// <param name="cacheDuration">Duration of the cache.</param>
- /// <param name="factoryFn">The factory function.</param>
- /// <returns>System.Object.</returns>
- protected object ToOptimizedResultUsingCache<T>(Guid cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration, Func<T> 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 f33a30892..3c0b7f140 100644
--- a/MediaBrowser.Api/ConfigurationService.cs
+++ b/MediaBrowser.Api/ConfigurationService.cs
@@ -105,13 +105,7 @@ namespace MediaBrowser.Api
/// <returns>System.Object.</returns>
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 74b37df92..2d7444f60 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);
}
/// <summary>