From 45f94fe006fa55e7047fc2e052c17c1643595f1c Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Wed, 26 Apr 2017 00:35:28 +0200
Subject: [PATCH] [Issue #206] - Prevent printing of logs to the status command

This is rather a workaround to prevent printing of log messages in CLI with the default logging level. I reduced CLI logging verbosity to "Info" and moved the messages polluting the output to Debug. Anyway, these logging levels seem to be reasonable. I also added Info logging for start/stop/install/restart commands just to have a welcome message in CLI.
---
 src/Core/ServiceWrapper/Main.cs | 20 +++++++++++++++-----
 src/Test/winswTests/MainTest.cs | 10 ++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/Core/ServiceWrapper/Main.cs b/src/Core/ServiceWrapper/Main.cs
index a7a924e..2f3d3b4 100644
--- a/src/Core/ServiceWrapper/Main.cs
+++ b/src/Core/ServiceWrapper/Main.cs
@@ -463,7 +463,7 @@ namespace winsw
             try
             {
                 Run(args);
-                Log.Info("Completed. Exit code is 0");
+                Log.Debug("Completed. Exit code is 0");
                 return 0;
             }
             catch (WmiException e)
@@ -509,7 +509,7 @@ namespace winsw
             
             if (isCLIMode) // CLI mode, in-service mode otherwise
             {               
-                Log.Info("Starting ServiceWrapper in the CLI mode");
+                Log.Debug("Starting ServiceWrapper in the CLI mode");
 
                 // Get service info for the future use
                 Win32Services svc = new WmiRoot().GetCollection<Win32Services>();
@@ -541,6 +541,8 @@ namespace winsw
                 args[0] = args[0].ToLower();
                 if (args[0] == "install")
                 {
+                    Log.Info("Installing the service with id '" + d.Id + "'");
+
                     // Check if the service exists
                     if (s != null)
                     {
@@ -668,18 +670,21 @@ namespace winsw
                 }
                 if (args[0] == "start")
                 {
+                    Log.Info("Starting the service with id '" + d.Id + "'");
                     if (s == null) ThrowNoSuchService();
                     s.StartService();
                     return;
                 }
                 if (args[0] == "stop")
                 {
+                    Log.Info("Stopping the service with id '" + d.Id + "'");
                     if (s == null) ThrowNoSuchService();
                     s.StopService();
                     return;
                 }
                 if (args[0] == "restart")
                 {
+                    Log.Info("Restarting the service with id '" + d.Id + "'");
                     if (s == null) 
                         ThrowNoSuchService();
 
@@ -697,6 +702,8 @@ namespace winsw
                 }
                 if (args[0] == "restart!")
                 {
+                    Log.Info("Restarting the service with id '" + d.Id + "'");
+
                     // run restart from another process group. see README.md for why this is useful.
 
                     STARTUPINFO si = new STARTUPINFO();
@@ -711,7 +718,7 @@ namespace winsw
                 }
                 if (args[0] == "status")
                 {
-                    Log.Warn("User requested the status");
+                    Log.Debug("User requested the status of the process with id '" + d.Id + "'");
                     if (s == null)
                         Console.WriteLine("NonExistent");
                     else if (s.Started)
@@ -756,6 +763,9 @@ namespace winsw
         {
             // TODO: Make logging levels configurable
             Level logLevel = Level.Debug;
+            // TODO: Debug should not be printed to console by default. Otherwise commands like 'status' will be pollutted
+            // This is a workaround till there is a better command line parsing, which will allow determining
+            Level consoleLogLevel = Level.Info; 
             Level eventLogLevel = Level.Warn;
 
             // Legacy format from winsw-1.x: (DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " - " + message);
@@ -784,8 +794,8 @@ namespace winsw
             {
                 var consoleAppender = new ConsoleAppender
                 {
-                    Name = "Wrapper console log", 
-                    Threshold = logLevel,
+                    Name = "Wrapper console log",
+                    Threshold = consoleLogLevel,
                     Layout = pl,
                 };
                 consoleAppender.ActivateOptions();
diff --git a/src/Test/winswTests/MainTest.cs b/src/Test/winswTests/MainTest.cs
index 6bf8402..0622f82 100644
--- a/src/Test/winswTests/MainTest.cs
+++ b/src/Test/winswTests/MainTest.cs
@@ -44,5 +44,15 @@ namespace winswTests
             // ReSharper disable once PossibleNullReferenceException
             StringAssert.Contains(expectedMessage, res.Exception.Message, "Expected the message about unknown command");
         }
+
+        /// <summary>
+        /// https://github.com/kohsuke/winsw/issues/206
+        /// </summary>
+        [Test]
+        public void ShouldNotPrintLogsForStatusCommand()
+        {
+            string cliOut = CLITestHelper.CLITest(new[] { "status" });
+            StringAssert.AreEqualIgnoringCase("NonExistent\r\n", cliOut);
+        }
     }
 }