Skip to content

Commit bd30f72

Browse files
committed
Fixing disposal issue uncovered by the default tracewriter changes
1 parent af52689 commit bd30f72

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

src/WebJobs.Script.WebHost/App_Start/WebHostResolver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ public void Dispose()
353353

354354
_activeHostManager?.Dispose();
355355
_activeReceiverManager?.Dispose();
356-
((IDisposable)_defaultTraceWriter)?.Dispose();
356+
(_defaultTraceWriter as IDisposable)?.Dispose();
357357
_defaultLoggerFactory?.Dispose();
358358
}
359359
}

test/WebJobs.Script.Tests/WebHostResolverTests.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,6 @@ public async Task GetTraceWriter_GetLogger_ReturnsExpectedValue()
9595
var hostManager = resolver.GetWebScriptHostManager(settings);
9696
Assert.Null(hostManager.Instance?.TraceWriter);
9797

98-
// verify the internals of the composite writer
99-
var fieldInfo = typeof(CompositeTraceWriter).GetField("_innerTraceWriters", BindingFlags.Instance | BindingFlags.NonPublic);
100-
TraceWriter[] innerWriters = ((IEnumerable<TraceWriter>)fieldInfo.GetValue(traceWriter)).ToArray();
101-
Assert.Equal(2, innerWriters.Length);
102-
Assert.Equal(typeof(SystemTraceWriter), innerWriters[0].GetType());
103-
Assert.Equal(typeof(FileTraceWriter), innerWriters[1].GetType());
104-
105-
// write a log and verify
106-
TestHelpers.ClearHostLogs();
107-
var id = Guid.NewGuid().ToString();
108-
traceWriter.Info(id);
109-
traceWriter.Flush();
110-
var logs = await TestHelpers.GetHostLogsAsync();
111-
Assert.True(logs.Single().Contains(id));
112-
11398
// ensure that the returned logger factory isn't null even though the host
11499
// hasn't been initialized yet
115100
var loggerFactory = resolver.GetLoggerFactory(settings);

0 commit comments

Comments
 (0)