From 908183290ee0aa371eccddded6cf2be619623f1c Mon Sep 17 00:00:00 2001 From: Chad Jessup Date: Sat, 21 Mar 2020 21:47:15 -0700 Subject: [PATCH] minor whitespace, typo, and structured logging, changes --- src/Microsoft.Tye.Core/DeployServiceYamlStep.cs | 3 --- src/Microsoft.Tye.Core/StandardOptions.cs | 2 +- .../TransformProjectsIntoContainers.cs | 2 +- src/Microsoft.Tye.Hosting/TyeHost.cs | 6 +++--- src/tye/CommonArguments.cs | 2 +- src/tye/Program.BuildCommand.cs | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Microsoft.Tye.Core/DeployServiceYamlStep.cs b/src/Microsoft.Tye.Core/DeployServiceYamlStep.cs index ad6a6c90..d71477f6 100644 --- a/src/Microsoft.Tye.Core/DeployServiceYamlStep.cs +++ b/src/Microsoft.Tye.Core/DeployServiceYamlStep.cs @@ -71,6 +71,3 @@ namespace Microsoft.Tye } } } - - - diff --git a/src/Microsoft.Tye.Core/StandardOptions.cs b/src/Microsoft.Tye.Core/StandardOptions.cs index 69fb5352..b919521b 100644 --- a/src/Microsoft.Tye.Core/StandardOptions.cs +++ b/src/Microsoft.Tye.Core/StandardOptions.cs @@ -185,7 +185,7 @@ namespace Microsoft.Tye { get { - return new Option(new[] { "-v", "--verbosity" }, "Output verbostiy") + return new Option(new[] { "-v", "--verbosity" }, "Output verbosity") { Argument = new Argument("one of: quiet|info|debug", () => Tye.Verbosity.Info) { diff --git a/src/Microsoft.Tye.Hosting/TransformProjectsIntoContainers.cs b/src/Microsoft.Tye.Hosting/TransformProjectsIntoContainers.cs index d4b2b4be..45788c6e 100644 --- a/src/Microsoft.Tye.Hosting/TransformProjectsIntoContainers.cs +++ b/src/Microsoft.Tye.Hosting/TransformProjectsIntoContainers.cs @@ -23,7 +23,7 @@ namespace Microsoft.Tye.Hosting public Task StartAsync(Model.Application application) { - // This transforms a ProjectRunInfo into + // This transforms a ProjectRunInfo into a container var tasks = new List(); foreach (var s in application.Services.Values) { diff --git a/src/Microsoft.Tye.Hosting/TyeHost.cs b/src/Microsoft.Tye.Hosting/TyeHost.cs index d0b389e6..cb6cca8f 100644 --- a/src/Microsoft.Tye.Hosting/TyeHost.cs +++ b/src/Microsoft.Tye.Hosting/TyeHost.cs @@ -192,13 +192,13 @@ namespace Microsoft.Tye.Hosting else if (IsPortInUseByBinding(_application, DefaultPort)) { // Port has been reserved for the app. - app.Logger.LogInformation($"Default dashboard port {DefaultPort} has been reserved by the application, choosing random port."); + app.Logger.LogInformation("Default dashboard port {DefaultPort} has been reserved by the application, choosing random port.", DefaultPort); return AutodetectPort; } else if (IsPortAlreadyInUse(DefaultPort)) { // Port is in use by something already running. - app.Logger.LogInformation($"Default dashboard port {DefaultPort} is in use, choosing random port."); + app.Logger.LogInformation("Default dashboard port {DefaultPort} is in use, choosing random port.", DefaultPort); return AutodetectPort; } else @@ -254,7 +254,7 @@ namespace Microsoft.Tye.Hosting new ProcessRunner(logger, ProcessRunnerOptions.FromArgs(args)), }; - // If the docker command is specified then transport the ProjectRunInfo into DockerRunInfo + // If the docker command is specified then transform the ProjectRunInfo into DockerRunInfo if (args.Contains("--docker")) { processors.Insert(0, new TransformProjectsIntoContainers(logger)); diff --git a/src/tye/CommonArguments.cs b/src/tye/CommonArguments.cs index db7cac84..0709e700 100644 --- a/src/tye/CommonArguments.cs +++ b/src/tye/CommonArguments.cs @@ -54,7 +54,7 @@ namespace Microsoft.Tye if (files.Length > 1) { - errorMessage = $"More than one matching files was found in directory '{directoryPath}'."; + errorMessage = $"More than one matching file was found in directory '{directoryPath}'."; filePath = default; return false; } diff --git a/src/tye/Program.BuildCommand.cs b/src/tye/Program.BuildCommand.cs index 740d9b7c..0af67d4f 100644 --- a/src/tye/Program.BuildCommand.cs +++ b/src/tye/Program.BuildCommand.cs @@ -16,7 +16,7 @@ namespace Microsoft.Tye { public static Command CreateBuildCommand() { - var command = new Command("build", "build container for the application") + var command = new Command("build", "build containers for the application") { CommonArguments.Path_Required, StandardOptions.Interactive,