Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Universal Output wasn't actually universal #8072

Merged
merged 3 commits into from
Apr 17, 2024
Merged

Universal Output wasn't actually universal #8072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c3e6b9
create a branch from main which does not have the additional stderr f…
scbedd Apr 10, 2024
64669b2
change the addition of consoles so that on universal output, stuff re…
scbedd Apr 10, 2024
f237cb3
finally fix the weirdness with the loglevel
scbedd Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tools/test-proxy/Azure.Sdk.Tools.TestProxy/CommandOptions/OptionsGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static RootCommand GenerateCommandLineOptions(Func<DefaultOptions, Task>
dumpOption.AddAlias("-d");

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

startCommand.SetHandler(async (startOpts) => await callback(startOpts),
Expand Down
10 changes: 7 additions & 3 deletions tools/test-proxy/Azure.Sdk.Tools.TestProxy/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,14 @@ private static void StartServer(StartOptions startOptions)
{
loggingBuilder.ClearProviders();
loggingBuilder.AddConfiguration(hostBuilder.Configuration.GetSection("Logging"));
loggingBuilder.AddConsole(options =>
if (!startOptions.UniversalOutput)
{
options.LogToStandardErrorThreshold = startOptions.UniversalOutput ? LogLevel.None : LogLevel.Error;
}).AddSimpleConsole(options =>
loggingBuilder.AddConsole(options =>
{
options.LogToStandardErrorThreshold = LogLevel.Error;
});
}
loggingBuilder.AddSimpleConsole(options =>
{
options.TimestampFormat = "[HH:mm:ss] ";
});
Expand Down