Fixed issues related to merge conflicts #791
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
darrelmiller
commented
Mar 14, 2022
| await rootCommand.InvokeAsync(args); | ||
|
|
||
| //// Wait for logger to write messages to the console before exiting | ||
| await Task.Delay(10); |
There was a problem hiding this comment.
This delay was necessary to ensure there was time for log messages to get written to the console.
darrelmiller
commented
Mar 14, 2022
| @@ -35,7 +36,7 @@ static async Task<int> Main(string[] args) | |||
| var formatOption = new Option<OpenApiFormat?>("--format", "File format"); | |||
| formatOption.AddAlias("-f"); | |||
|
|
|||
| var logLevelOption = new Option<LogLevel>("--loglevel", () => LogLevel.Warning, "The log level to use when logging messages to the main output."); | |||
| var logLevelOption = new Option<LogLevel>("--loglevel", () => LogLevel.Information, "The log level to use when logging messages to the main output."); | |||
There was a problem hiding this comment.
Changed the default so that logs at the Information level will be showed by default. Without this the stats output by the validate are not shown by default.
darrelmiller
commented
Mar 14, 2022
| @@ -11,7 +12,7 @@ namespace Microsoft.OpenApi.Hidi | |||
| { | |||
| static class Program | |||
| { | |||
| static async Task<int> Main(string[] args) | |||
| static async Task Main(string[] args) | |||
There was a problem hiding this comment.
According to the docs for System.CommandLine this isn't necessary.
darrelmiller
commented
Mar 14, 2022
|
|
||
| stream = await GetStream(csdl, logger, cancellationToken); | ||
| document = await ConvertCsdlToOpenApi(stream); | ||
| using (logger.BeginScope($"Convert CSDL: {csdl}", csdl)) |
There was a problem hiding this comment.
Use the BeginScope call to provide context to the logging messages.
MaggieKimani1
approved these changes
Mar 14, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some of the logic around default versions got broken during the merging to vnext.
Also, the mysteriously missing error messages was caused by a timing issue where the console application would shut down before the message got written to the console. By adding a 10ms delay on shutdown, the console has time to write the message out.