github
/
winsw
mirror of https://github.com/winsw/winsw
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #214 from oleg-nenashev/Issue206_status_log 

[Issue #206] - Prevent printing of logs in the status command
pull/220/head
Oleg Nenashev 2017-05-03 15:42:00 +03:00 committed by GitHub
parent db3904ce83 45f94fe006
commit 7be52c79e4
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Core/ServiceWrapper/Main.cs
View File

@ -463,7 +463,7 @@ namespace winsw
try try
{ {
Run(args); Run(args);
Log.Info("Completed. Exit code is 0"); Log.Debug("Completed. Exit code is 0");
return 0; return 0;
} }
catch (WmiException e) catch (WmiException e)
@ -509,7 +509,7 @@ namespace winsw
if (isCLIMode) // CLI mode, in-service mode otherwise 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 // Get service info for the future use
Win32Services svc = new WmiRoot().GetCollection<Win32Services>(); Win32Services svc = new WmiRoot().GetCollection<Win32Services>();
@ -541,6 +541,8 @@ namespace winsw
args[0] = args[0].ToLower(); args[0] = args[0].ToLower();
if (args[0] == "install") if (args[0] == "install")
{ {
Log.Info("Installing the service with id '" + d.Id + "'");
// Check if the service exists // Check if the service exists
if (s != null) if (s != null)
{ {
@ -668,18 +670,21 @@ namespace winsw
} }
if (args[0] == "start") if (args[0] == "start")
{ {
Log.Info("Starting the service with id '" + d.Id + "'");
if (s == null) ThrowNoSuchService(); if (s == null) ThrowNoSuchService();
s.StartService(); s.StartService();
return; return;
} }
if (args[0] == "stop") if (args[0] == "stop")
{ {
Log.Info("Stopping the service with id '" + d.Id + "'");
if (s == null) ThrowNoSuchService(); if (s == null) ThrowNoSuchService();
s.StopService(); s.StopService();
return; return;
} }
if (args[0] == "restart") if (args[0] == "restart")
{ {
Log.Info("Restarting the service with id '" + d.Id + "'");
if (s == null) if (s == null)
ThrowNoSuchService(); ThrowNoSuchService();
@ -697,6 +702,8 @@ namespace winsw
} }
if (args[0] == "restart!") 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. // run restart from another process group. see README.md for why this is useful.
STARTUPINFO si = new STARTUPINFO(); STARTUPINFO si = new STARTUPINFO();
@ -711,7 +718,7 @@ namespace winsw
} }
if (args[0] == "status") 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) if (s == null)
Console.WriteLine("NonExistent"); Console.WriteLine("NonExistent");
else if (s.Started) else if (s.Started)
@ -756,6 +763,9 @@ namespace winsw
{ {
// TODO: Make logging levels configurable // TODO: Make logging levels configurable
Level logLevel = Level.Debug; 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; Level eventLogLevel = Level.Warn;
// Legacy format from winsw-1.x: (DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " - " + message); // Legacy format from winsw-1.x: (DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " - " + message);
@ -785,7 +795,7 @@ namespace winsw
var consoleAppender = new ConsoleAppender var consoleAppender = new ConsoleAppender
{ {
Name = "Wrapper console log", Name = "Wrapper console log",
Threshold = logLevel, Threshold = consoleLogLevel,
Layout = pl, Layout = pl,
}; };
consoleAppender.ActivateOptions(); consoleAppender.ActivateOptions();

10
src/Test/winswTests/MainTest.cs
View File

@ -44,5 +44,15 @@ namespace winswTests
// ReSharper disable once PossibleNullReferenceException // ReSharper disable once PossibleNullReferenceException
StringAssert.Contains(expectedMessage, res.Exception.Message, "Expected the message about unknown command"); 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);
}
} }
} }