Skip to content

Commit fa3a381

Browse files
committed
Fixing VirtualFileSystem registration
1 parent 7ce3e6f commit fa3a381

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/WebJobs.Script.WebHost/Management/VirtualFileSystem.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using Microsoft.Azure.WebJobs.Script.WebHost.Helpers;
2020
using Microsoft.Azure.WebJobs.Script.WebHost.Models;
2121
using Microsoft.Extensions.Logging;
22+
using Microsoft.Extensions.Options;
2223
using Newtonsoft.Json;
2324

2425
namespace Microsoft.Azure.WebJobs.Script.WebHost.Management
@@ -33,12 +34,12 @@ public class VirtualFileSystem
3334
private static readonly MediaTypeHeaderValue _directoryMediaType = MediaTypeHeaderValue.Parse("inode/directory");
3435

3536
protected const int BufferSize = 32 * 1024;
36-
private readonly ScriptJobHostOptions _config;
37+
private readonly IOptionsMonitor<ScriptApplicationHostOptions> _options;
3738
private readonly ILogger _logger;
3839

39-
public VirtualFileSystem(ScriptApplicationHostOptions settings, ILoggerFactory loggerFactory)
40+
public VirtualFileSystem(IOptionsMonitor<ScriptApplicationHostOptions> options, ILoggerFactory loggerFactory)
4041
{
41-
_config = settings.ToHostOptions();
42+
_options = options;
4243
_logger = loggerFactory.CreateLogger<VirtualFileSystem>();
4344
MediaTypeMap = MediaTypeMap.Default;
4445
}
@@ -48,7 +49,7 @@ protected string RootPath
4849
get
4950
{
5051
return RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
51-
? ScriptSettingsManager.Instance.GetSetting(EnvironmentSettingNames.AzureWebsiteHomePath) ?? Path.GetFullPath(_config.RootScriptPath)
52+
? ScriptSettingsManager.Instance.GetSetting(EnvironmentSettingNames.AzureWebsiteHomePath) ?? Path.GetFullPath(_options.CurrentValue.ScriptPath)
5253
: Path.DirectorySeparatorChar.ToString();
5354
}
5455
}

test/WebJobs.Script.Tests/Managment/VirtualFileSystemFacts.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,10 @@ private static IFileSystem CreateFileSystem(string path, DirectoryInfoBase dir,
217217

218218
private VirtualFileSystem CreateVirtualFileSystem()
219219
{
220-
return new VirtualFileSystem(new ScriptApplicationHostOptions
220+
return new VirtualFileSystem(new TestOptionsMonitor<ScriptApplicationHostOptions>(new ScriptApplicationHostOptions
221221
{
222222
ScriptPath = SiteRootPath
223-
}, NullLoggerFactory.Instance);
223+
}), NullLoggerFactory.Instance);
224224
}
225225

226226
public void Dispose()

0 commit comments

Comments
 (0)