lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing performance issue in OutputCache

Browse Source
This commit is contained in:
Sebastien Ros
2014-09-26 12:54:40 -07:00
parent aafb915892
commit abed55164d
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Modules/Orchard.Email/Services/MissingSettingsBanner.cs
-2
View File
@@ -22,8 +22,6 @@ namespace Orchard.Email.Services {
var workContext = _orchardServices.WorkContext;
var smtpSettings = workContext.CurrentSite.As<SmtpSettingsPart>();
var smtpClient = new SmtpClient();
if (smtpSettings == null || !smtpSettings.IsValid()) {
var urlHelper = new UrlHelper(workContext.HttpContext.Request.RequestContext);
var url = urlHelper.Action("Email", "Admin", new {Area = "Settings"});
src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
+5 -5
View File
@@ -23,6 +23,7 @@ using Orchard.Utility.Extensions;
using System.Collections.Specialized;
using Orchard.OutputCache.ViewModels;
using Orchard.UI.Admin.Notification;
using Orchard.DisplayManagement.Shapes;
namespace Orchard.OutputCache.Filters {
public class OutputCacheFilter : FilterProvider, IActionFilter, IResultFilter {
@@ -38,7 +39,6 @@ namespace Orchard.OutputCache.Filters {
private readonly ISignals _signals;
private readonly ShellSettings _shellSettings;
private readonly ICacheControlStrategy _cacheControlStrategy;
private readonly INotificationManager _notificationManager;
TextWriter _originalWriter;
StringWriter _cachingWriter;
@@ -57,8 +57,7 @@ namespace Orchard.OutputCache.Filters {
ICacheService cacheService,
ISignals signals,
ShellSettings shellSettings,
ICacheControlStrategy cacheControlStrategy,
INotificationManager notificationManager
ICacheControlStrategy cacheControlStrategy
) {
_cacheManager = cacheManager;
_cacheStorageProvider = cacheStorageProvider;
@@ -71,7 +70,6 @@ namespace Orchard.OutputCache.Filters {
_signals = signals;
_shellSettings = shellSettings;
_cacheControlStrategy = cacheControlStrategy;
_notificationManager = notificationManager;
Logger = NullLogger.Instance;
}
@@ -345,7 +343,9 @@ namespace Orchard.OutputCache.Filters {
}
// don't cache the result if there were some notifications
if (_notificationManager.GetNotifications().Any()) {
// notifications can come from Notifier and NotificationProvider
var messagesZone = _workContextAccessor.GetContext(filterContext).Layout.Zones["Messages"] as Shape;
if (messagesZone != null && messagesZone.Items.Any()) {
return;
}