git-svn-id: https://svn.kenai.com/svn/winsw~subversion/trunk@23 c8b2a3fe-9b5b-6a51-a37e-dc31b0e308fa
remotes/git-svn
jjasper4 2009-01-14 18:55:49 +00:00
parent cb3cff2dbe
commit 8fc1277776
1 changed files with 42 additions and 42 deletions

84
Main.cs
View File

@ -73,28 +73,28 @@ namespace winsw
var n = dom.SelectSingleNode("//" + tagName);
if (n == null) throw new InvalidDataException("<" + tagName + "> is missing in configuration XML");
return Environment.ExpandEnvironmentVariables(n.InnerText);
}
/// <summary>
/// Path to the executable.
/// </summary>
public string Executable
{
get
{
return SingleElement("executable");
}
}
/// <summary>
/// Optionally specify a different Path to an executable to shutdown the service.
/// </summary>
public string StopExecutable
{
get
{
return AppendTags("stopexecutable");
}
}
/// <summary>
/// Path to the executable.
/// </summary>
public string Executable
{
get
{
return SingleElement("executable");
}
}
/// <summary>
/// Optionally specify a different Path to an executable to shutdown the service.
/// </summary>
public string StopExecutable
{
get
{
return AppendTags("stopexecutable");
}
}
/// <summary>
@ -434,8 +434,8 @@ namespace winsw
startarguments += " " + descriptor.Arguments;
}
EventLog.WriteEntry("Starting " + descriptor.Executable + ' ' + startarguments);
EventLog.WriteEntry("Starting " + descriptor.Executable + ' ' + startarguments);
StartProcess(process, startarguments, descriptor.Executable);
// send stdout and stderr to its respective output file.
@ -463,18 +463,18 @@ namespace winsw
}
else
{
stoparguments += " " + descriptor.Arguments;
Process stopProcess = new Process();
String executable = descriptor.StopExecutable;
if (executable == null)
{
executable = descriptor.Executable;
}
StartProcess(stopProcess, stoparguments, executable);
// stopProcess.WaitForExit();
stoparguments += " " + descriptor.Arguments;
Process stopProcess = new Process();
String executable = descriptor.StopExecutable;
if (executable == null)
{
executable = descriptor.Executable;
}
StartProcess(stopProcess, stoparguments, executable);
// stopProcess.WaitForExit();
process.WaitForExit();
}
}
@ -616,12 +616,12 @@ namespace winsw
ThrowNoSuchService();
if(s.Started)
s.StopService();
while (s.Started)
{
Thread.Sleep(1000);
s = svc.Select(d.Id);
s.StopService();
while (s.Started)
{
Thread.Sleep(1000);
s = svc.Select(d.Id);
}
s.StartService();