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

Merge pull request #165 from oleg-nenashev/bug/Issue164_UninstallLogging 

Issue #146 - Improve logging of the Uninstall Operation.
pull/166/head
Oleg Nenashev 2016-12-17 17:13:01 +01:00 committed by GitHub
parent e18207cdd6 3c6d8e2765
commit 099c41f19d
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -644,11 +644,19 @@ namespace winsw
} }
if (args[0] == "uninstall") if (args[0] == "uninstall")
{ {
Log.Info("Uninstalling the service with id '" + d.Id + "'");
if (s == null) if (s == null)
{ {
Console.WriteLine("Warning! The service with id '" + d.Id + "' does not exist. Nothing to uninstall"); Log.Warn("The service with id '" + d.Id + "' does not exist. Nothing to uninstall");
return; // there's no such service, so consider it already uninstalled return; // there's no such service, so consider it already uninstalled
} }
if (s.Started)
{
// We could fail the opeartion here, but it would be an incompatible change.
// So it is just a warning
Log.Warn("The service with id '" + d.Id + "' is running. It may be impossible to uninstall it");
}
try try
{ {
s.Delete(); s.Delete();
@ -656,7 +664,17 @@ namespace winsw
catch (WmiException e) catch (WmiException e)
{ {
if (e.ErrorCode == ReturnValue.ServiceMarkedForDeletion) if (e.ErrorCode == ReturnValue.ServiceMarkedForDeletion)
{
Log.Error("Failed to uninstall the service with id '" + d.Id + "'"
+ ". It has been marked for deletion.");
// TODO: change the default behavior to Error?
return; // it's already uninstalled, so consider it a success return; // it's already uninstalled, so consider it a success
}
else
{
Log.Fatal("Failed to uninstall the service with id '" + d.Id + "'. WMI Error code is '" + e.ErrorCode + "'");
}
throw e; throw e;
} }
return; return;