Skip to content

Commit 116fab2

Browse files
committed
Removing F# from warmup path
1 parent f24f85c commit 116fab2

File tree

6 files changed

+7
-29
lines changed

6 files changed

+7
-29
lines changed

src/WebJobs.Script.WebHost/Resources/Functions/Test-FSharp/function.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/WebJobs.Script.WebHost/Resources/Functions/Test-FSharp/run.fsx

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,6 @@
470470
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
471471
<SubType>Designer</SubType>
472472
</EmbeddedResource>
473-
<EmbeddedResource Include="Resources\Functions\Test-FSharp\run.fsx" />
474473
<EmbeddedResource Include="Home.html" />
475474
<Content Include="Web.config" />
476475
</ItemGroup>
@@ -591,7 +590,6 @@
591590
<EmbeddedResource Include="Resources\Functions\host.json" />
592591
<EmbeddedResource Include="Resources\Functions\Test-CSharp\function.json" />
593592
<EmbeddedResource Include="Resources\Functions\Test-CSharp\run.csx" />
594-
<EmbeddedResource Include="Resources\Functions\Test-FSharp\function.json" />
595593
<None Include="Web.Debug.config">
596594
<DependentUpon>Web.config</DependentUpon>
597595
</None>

src/WebJobs.Script.WebHost/WebScriptHostManager.cs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public void Initialize()
239239
}
240240
}
241241

242-
public static void WarmUp(WebHostSettings settings, IScriptEventManager eventManager)
242+
public static async Task WarmUp(WebHostSettings settings, IScriptEventManager eventManager)
243243
{
244244
var traceWriter = new FileTraceWriter(Path.Combine(settings.LogPath, "Host"), TraceLevel.Info);
245245
ScriptHost host = null;
@@ -265,14 +265,6 @@ public static void WarmUp(WebHostSettings settings, IScriptEventManager eventMan
265265
content = ReadResourceString("Functions.Test_CSharp.run.csx");
266266
File.WriteAllText(Path.Combine(functionPath, "run.csx"), content);
267267

268-
// read in the F# function
269-
functionPath = Path.Combine(rootPath, "Test-FSharp");
270-
Directory.CreateDirectory(functionPath);
271-
content = ReadResourceString("Functions.Test_FSharp.function.json");
272-
File.WriteAllText(Path.Combine(functionPath, "function.json"), content);
273-
content = ReadResourceString("Functions.Test_FSharp.run.fsx");
274-
File.WriteAllText(Path.Combine(functionPath, "run.fsx"), content);
275-
276268
traceWriter.Info("Warm up functions deployed");
277269

278270
ScriptHostConfiguration config = new ScriptHostConfiguration
@@ -296,9 +288,10 @@ public static void WarmUp(WebHostSettings settings, IScriptEventManager eventMan
296288
{ "input", "{}" }
297289
};
298290
host.CallAsync("Test-CSharp", arguments).Wait();
299-
host.CallAsync("Test-FSharp", arguments).Wait();
300291
host.Stop();
301292

293+
await NodeFunctionInvoker.InitializeAsync();
294+
302295
traceWriter.Info("Warm up succeeded");
303296
}
304297
catch (Exception ex)

src/WebJobs.Script/Description/Node/NodeFunctionInvoker.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ private static bool TryDeserializeJson<TResult>(string json, out TResult result)
705705
/// <summary>
706706
/// Performs required static initialization in the Edge context.
707707
/// </summary>
708-
private static async Task InitializeAsync()
708+
internal static async Task InitializeAsync()
709709
{
710710
var handle = (ScriptFunc)(err =>
711711
{

test/WebJobs.Script.Tests.Integration/Host/StandbyModeTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System;
55
using System.IO;
66
using System.Linq;
7+
using System.Threading.Tasks;
78
using Microsoft.Azure.WebJobs.Script.Config;
89
using Microsoft.Azure.WebJobs.Script.Eventing;
910
using Microsoft.Azure.WebJobs.Script.WebHost;
@@ -121,21 +122,20 @@ private void TestGetter<T>(Func<WebHostSettings, T> func)
121122
}
122123

123124
[Fact]
124-
public void Warmup_Succeeds()
125+
public async Task Warmup_Succeeds()
125126
{
126127
using (new TestEnvironment())
127128
{
128129
var settings = GetWebHostSettings();
129130
var eventManagerMock = new Mock<IScriptEventManager>();
130-
WebScriptHostManager.WarmUp(settings, eventManagerMock.Object);
131+
await WebScriptHostManager.WarmUp(settings, eventManagerMock.Object);
131132

132133
var hostLogPath = Path.Combine(settings.LogPath, @"host");
133134
var hostLogFile = Directory.GetFiles(hostLogPath).First();
134135
var content = File.ReadAllText(hostLogFile);
135136

136137
Assert.Contains("Warm up started", content);
137138
Assert.Contains("Executed 'Functions.Test-CSharp' (Succeeded, Id=", content);
138-
Assert.Contains("Executed 'Functions.Test-FSharp' (Succeeded, Id=", content);
139139
Assert.Contains("Warm up succeeded", content);
140140
}
141141
}

0 commit comments

Comments
 (0)