Skip to content

Commit 58f5a4a

Browse files
committed
Revert "adding DeferredLogger to send WebHost logs to JobHost"
This reverts commit 56f7ef5.
1 parent 83157aa commit 58f5a4a

32 files changed

+213
-589
lines changed

src/WebJobs.Script.WebHost/DependencyInjection/DependencyValidator/DependencyValidator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Microsoft.Azure.WebJobs.Script.Diagnostics;
99
using Microsoft.Azure.WebJobs.Script.Eventing;
1010
using Microsoft.Azure.WebJobs.Script.FileProvisioning;
11+
using Microsoft.Azure.WebJobs.Script.Rpc;
1112
using Microsoft.Azure.WebJobs.Script.WebHost.Diagnostics;
1213
using Microsoft.Extensions.DependencyInjection;
1314
using Microsoft.Extensions.Hosting;
@@ -43,7 +44,7 @@ private static ExpectedDependencyBuilder CreateExpectedDependencies()
4344
.Expect<PrimaryHostCoordinator>()
4445
.Expect<HttpInitializationService>()
4546
.Expect<FileMonitoringService>()
46-
.Expect<DeferredLoggerService>()
47+
.Expect<LanguageWorkerConsoleLogService>()
4748
.Optional<FuncAppFileProvisioningService>() // Used by powershell.
4849
.Optional<JobHostService>() // Missing when host is offline.
4950
.Optional<FunctionsSyncService>(); // Conditionally registered.

src/WebJobs.Script.WebHost/Diagnostics/DeferredLogger/DeferredLogMessage.cs

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

src/WebJobs.Script.WebHost/Diagnostics/DeferredLogger/DeferredLogger.cs

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

src/WebJobs.Script.WebHost/Diagnostics/DeferredLogger/DeferredLoggerProvider.cs

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

src/WebJobs.Script.WebHost/Diagnostics/DeferredLogger/DeferredLoggerService.cs

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

src/WebJobs.Script.WebHost/Diagnostics/DeferredLogger/IDeferredLogSource.cs

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

src/WebJobs.Script.WebHost/Diagnostics/ILoggingBuilderExtensions.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,5 @@ public static void AddWebJobsSystem<T>(this ILoggingBuilder builder) where T : S
1515
// Log all logs to SystemLogger
1616
builder.AddDefaultWebJobsFilters<T>(LogLevel.Trace);
1717
}
18-
19-
public static void AddDeferred(this ILoggingBuilder builder)
20-
{
21-
// Do not filter this. It will be filtered internally.
22-
builder.Services.AddSingleton<DeferredLoggerProvider>();
23-
builder.AddFilter<DeferredLoggerProvider>(_ => true);
24-
25-
builder.Services.AddSingleton<ILoggerProvider>(s => s.GetRequiredService<DeferredLoggerProvider>());
26-
builder.Services.AddSingleton<IDeferredLogSource>(s => s.GetRequiredService<DeferredLoggerProvider>());
27-
}
2818
}
2919
}

src/WebJobs.Script.WebHost/Middleware/SystemTraceMiddleware.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ public async Task Invoke(HttpContext context)
4242
{
4343
[ScriptConstants.LogPropertyActivityIdKey] = request.GetRequestId()
4444
};
45-
_logger.Log(LogLevel.Debug, 0, logData, null, (s, e) => $"Executing HTTP request: {details}");
45+
_logger.Log(LogLevel.Information, 0, logData, null, (s, e) => $"Executing HTTP request: {details}");
4646

4747
await _next.Invoke(context);
4848

4949
sw.Stop();
5050
details["identities"] = GetIdentities(context);
5151
details["status"] = context.Response.StatusCode;
5252
details["duration"] = sw.ElapsedMilliseconds;
53-
_logger.Log(LogLevel.Debug, 0, logData, null, (s, e) => $"Executed HTTP request: {details}");
53+
_logger.Log(LogLevel.Information, 0, logData, null, (s, e) => $"Executed HTTP request: {details}");
5454
}
5555

5656
internal static void SetRequestId(HttpRequest request)

src/WebJobs.Script.WebHost/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args = null)
6969

7070
loggingBuilder.AddDefaultWebJobsFilters();
7171
loggingBuilder.AddWebJobsSystem<WebHostSystemLoggerProvider>();
72-
loggingBuilder.AddDeferred();
7372
})
7473
.UseStartup<Startup>();
7574
}

src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ public static IHostBuilder AddWebScriptHost(this IHostBuilder builder, IServiceP
3636
services.ConfigureOptions<HttpOptionsSetup>();
3737
services.ConfigureOptions<CustomHttpHeadersOptionsSetup>();
3838
services.ConfigureOptions<HostHstsOptionsSetup>();
39-
40-
// Add logging service early.
41-
services.AddSingleton<IHostedService, DeferredLoggerService>();
4239
})
4340
.AddScriptHost(webHostOptions, configLoggerFactory, webJobsBuilder =>
4441
{

0 commit comments

Comments
 (0)