From 0b13882f7997c57248db935948ed25aa72b30251 Mon Sep 17 00:00:00 2001
From: Tatarincev <et@virtoway.com>
Date: Fri, 21 Apr 2017 10:38:00 +0200
Subject: [PATCH] Allow to load cache configuration from web.config

---
 VirtoCommerce.Platform.Web/Startup.cs | 23 ++++++++++++++++-------
 VirtoCommerce.Platform.Web/Web.config | 26 +++++++++++++++++++-------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/VirtoCommerce.Platform.Web/Startup.cs b/VirtoCommerce.Platform.Web/Startup.cs
index 65917cff0b9..3f155f4a68e 100644
--- a/VirtoCommerce.Platform.Web/Startup.cs
+++ b/VirtoCommerce.Platform.Web/Startup.cs
@@ -11,6 +11,7 @@
 using System.Web.Optimization;
 using System.Web.Routing;
 using CacheManager.Core;
+using CacheManager.Core.Configuration;
 using Common.Logging;
 using Hangfire;
 using Microsoft.ApplicationInsights.Extensibility;
@@ -326,14 +327,22 @@ private static void InitializePlatform(IAppBuilder app, IUnityContainer containe
             var moduleCatalog = container.Resolve<IModuleCatalog>();
 
             #region Caching
-            var cacheManager = CacheFactory.Build("platformCache", settings =>
+            ICacheManager<object> cacheManager = null;
+            //Try to load cache configuration from web.config first
+            if (ConfigurationManager.GetSection(CacheManagerSection.DefaultSectionName) != null)
             {
-                //Should be aware to using Web cache cache handle because it not worked in native threads. (Hangfire jobs)
-                settings
-                    .WithUpdateMode(CacheUpdateMode.Up)
-                    .WithSystemRuntimeCacheHandle("memCacheHandle")
-                        .WithExpiration(ExpirationMode.Absolute, TimeSpan.FromDays(1));
-            });
+                cacheManager = CacheFactory.FromConfiguration<object>("platformCache");
+            }
+            else
+            {
+                cacheManager = CacheFactory.Build("platformCache", settings =>
+                {
+                    //Should be aware to using Web cache cache handle because it not worked in native threads. (Hangfire jobs)
+                    settings.WithUpdateMode(CacheUpdateMode.Up)
+                            .WithSystemRuntimeCacheHandle("memCacheHandle")
+                            .WithExpiration(ExpirationMode.Absolute, TimeSpan.FromDays(1));
+                });
+            }
             container.RegisterInstance(cacheManager);
             #endregion
 
diff --git a/VirtoCommerce.Platform.Web/Web.config b/VirtoCommerce.Platform.Web/Web.config
index 8b1a31af79c..af773268702 100644
--- a/VirtoCommerce.Platform.Web/Web.config
+++ b/VirtoCommerce.Platform.Web/Web.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
+        <section name="cacheManager" type="CacheManager.Core.Configuration.CacheManagerSection, CacheManager.Core" />
         <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         <section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog" />
         <sectionGroup name="common">
@@ -58,6 +59,23 @@
             <add address="*" maxconnection="96" />
         </connectionManagement>
     </system.net>
+    <cacheManager>
+        <managers>
+            <cache name="platformCache" updateMode="Up" enableStatistics="false" enablePerformanceCounters="false">
+                <handle ref="memCacheHandle" name="memCacheHandle" expirationMode="Absolute" timeout="30m" />
+            </cache>
+        </managers>
+        <cacheHandles>
+            <handleDef id="memCacheHandle" type="CacheManager.SystemRuntimeCaching.MemoryCacheHandle`1, CacheManager.SystemRuntimeCaching"/>
+        </cacheHandles>
+    </cacheManager>
+    <system.runtime.caching>
+        <memoryCache>
+            <namedCaches>
+                <add name="memCacheHandle"  physicalMemoryLimitPercentage="80" pollingInterval="00:00:30" />
+            </namedCaches>
+        </memoryCache>
+    </system.runtime.caching>
     <system.web>
         <compilation targetFramework="4.6.1" debug="true" />
         <!-- 50MB in kilobytes, default is 4096 or 4MB-->
@@ -109,13 +127,7 @@
             </requestFiltering>
         </security>
     </system.webServer>
-    <system.runtime.caching>
-        <memoryCache>
-            <namedCaches>
-                <add name="memCacheHandle"  physicalMemoryLimitPercentage="80" pollingInterval="00:00:30" />
-            </namedCaches>
-        </memoryCache>
-    </system.runtime.caching>
+    
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <probing privatePath="App_Data\Modules" />