Skip to content

Commit 93565cb

Browse files
authored
Universal Output wasn't actually universal (#8072)
* change the addition of consoles so that on universal output, stuff really doesn't make it to stderr * finally fix the weirdness with the loglevel
1 parent 5bac009 commit 93565cb

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

tools/test-proxy/Azure.Sdk.Tools.TestProxy/CommandOptions/OptionsGenerator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static RootCommand GenerateCommandLineOptions(Func<DefaultOptions, Task>
5050
dumpOption.AddAlias("-d");
5151

5252
var universalOption = new Option<bool>(
53-
name: "--universalOutput",
53+
name: "--universal",
5454
description: "Flag; Redirect all logs to stdout, including what would normally be showing up on stderr.",
5555
getDefaultValue: () => false);
5656
universalOption.AddAlias("-u");
@@ -83,6 +83,7 @@ public static RootCommand GenerateCommandLineOptions(Func<DefaultOptions, Task>
8383
var startCommand = new Command("start", "Start the TestProxy.");
8484
startCommand.AddOption(insecureOption);
8585
startCommand.AddOption(dumpOption);
86+
startCommand.AddOption(universalOption);
8687
startCommand.AddArgument(collectedArgs);
8788

8889
startCommand.SetHandler(async (startOpts) => await callback(startOpts),

tools/test-proxy/Azure.Sdk.Tools.TestProxy/Startup.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,14 @@ private static void StartServer(StartOptions startOptions)
147147
{
148148
loggingBuilder.ClearProviders();
149149
loggingBuilder.AddConfiguration(hostBuilder.Configuration.GetSection("Logging"));
150-
loggingBuilder.AddConsole(options =>
150+
if (!startOptions.UniversalOutput)
151151
{
152-
options.LogToStandardErrorThreshold = startOptions.UniversalOutput ? LogLevel.None : LogLevel.Error;
153-
}).AddSimpleConsole(options =>
152+
loggingBuilder.AddConsole(options =>
153+
{
154+
options.LogToStandardErrorThreshold = LogLevel.Error;
155+
});
156+
}
157+
loggingBuilder.AddSimpleConsole(options =>
154158
{
155159
options.TimestampFormat = "[HH:mm:ss] ";
156160
});

0 commit comments

Comments
 (0)