lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 10:54:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix regression in monitoring file changes

Browse Source 
We were only monitoring existing directories only (not files).
Since asp.net supports monitoring missing files, but not missing
directories, we have to catch the HttpException and fallback
adequatly.

--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-12-05 14:41:41 -08:00
parent 91c5e6dae8
commit 947fb55d7d
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Orchard/FileSystems/VirtualPath/DefaultVirtualPathMonitor.cs
View File

@@ -1,8 +1,10 @@
using System;
using System.Collections.Generic;
using System.Web;
using System.Web.Caching;
using System.Web.Hosting;
using Orchard.Caching;
using Orchard.Logging;
using Orchard.Services;
namespace Orchard.FileSystems.VirtualPath {
@@ -11,22 +13,28 @@ namespace Orchard.FileSystems.VirtualPath {
private readonly string _prefix = Guid.NewGuid().ToString("n");
private readonly IDictionary<string, Weak<Token>> _tokens = new Dictionary<string, Weak<Token>>();
private readonly IClock _clock;
private readonly IVirtualPathProvider _virtualPathProvider;
public DefaultVirtualPathMonitor(IClock clock, IVirtualPathProvider virtualPathProvider) {
public DefaultVirtualPathMonitor(IClock clock) {
_clock = clock;
_virtualPathProvider = virtualPathProvider;
_thunk = new Thunk(this);
Logger = NullLogger.Instance;
}
ILogger Logger { get; set; }
public IVolatileToken WhenPathChanges(string virtualPath) {
// Fix this to monitor first existing parent directory.
IVolatileToken token = new Token(virtualPath);
if (_virtualPathProvider.DirectoryExists(virtualPath)) {
token = BindToken(virtualPath);
try {
var token = BindToken(virtualPath);
BindSignal(virtualPath);
return token;
}
catch (HttpException e) {
// This exception happens if trying to monitor a directory or file
// inside a directory which doesn't exist
Logger.Warning(e, "Error monitor file changes on virtual path '{0}'", virtualPath);
// Fix this to monitor first existing parent directory.
return new Token(virtualPath);
}
return token;
}
private Token BindToken(string virtualPath) {