mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-04-05 21:01:35 +08:00
Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x
This commit is contained in:
commit
54a1bdf03a
@ -41,7 +41,7 @@ namespace Orchard.OutputCache.Filters {
|
|||||||
private readonly ICacheService _cacheService;
|
private readonly ICacheService _cacheService;
|
||||||
private readonly ISignals _signals;
|
private readonly ISignals _signals;
|
||||||
private readonly ShellSettings _shellSettings;
|
private readonly ShellSettings _shellSettings;
|
||||||
private readonly ICachingEventHandler _chachingEvents;
|
private readonly ICachingEventHandler _cachingEvents;
|
||||||
private bool _isDisposed = false;
|
private bool _isDisposed = false;
|
||||||
|
|
||||||
public ILogger Logger { get; set; }
|
public ILogger Logger { get; set; }
|
||||||
@ -57,7 +57,7 @@ namespace Orchard.OutputCache.Filters {
|
|||||||
ICacheService cacheService,
|
ICacheService cacheService,
|
||||||
ISignals signals,
|
ISignals signals,
|
||||||
ShellSettings shellSettings,
|
ShellSettings shellSettings,
|
||||||
ICachingEventHandler chachingEvents) {
|
ICachingEventHandler cachingEvents) {
|
||||||
|
|
||||||
_cacheManager = cacheManager;
|
_cacheManager = cacheManager;
|
||||||
_cacheStorageProvider = cacheStorageProvider;
|
_cacheStorageProvider = cacheStorageProvider;
|
||||||
@ -69,7 +69,7 @@ namespace Orchard.OutputCache.Filters {
|
|||||||
_cacheService = cacheService;
|
_cacheService = cacheService;
|
||||||
_signals = signals;
|
_signals = signals;
|
||||||
_shellSettings = shellSettings;
|
_shellSettings = shellSettings;
|
||||||
_chachingEvents = chachingEvents;
|
_cachingEvents = cachingEvents;
|
||||||
|
|
||||||
Logger = NullLogger.Instance;
|
Logger = NullLogger.Instance;
|
||||||
}
|
}
|
||||||
@ -621,7 +621,7 @@ namespace Orchard.OutputCache.Filters {
|
|||||||
|
|
||||||
//make CacheKey morphable by external modules
|
//make CacheKey morphable by external modules
|
||||||
try {
|
try {
|
||||||
keyBuilder = _chachingEvents.ParticipateInCacheKey(keyBuilder);
|
keyBuilder = _cachingEvents.ParticipateInCacheKey(keyBuilder);
|
||||||
} catch (UnauthorizedAccessException ex) {
|
} catch (UnauthorizedAccessException ex) {
|
||||||
throw new UnauthorizedAccessException();
|
throw new UnauthorizedAccessException();
|
||||||
} catch { }
|
} catch { }
|
||||||
|
Loading…
Reference in New Issue
Block a user