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

Disable undocumented argument concatenation

pull/607/head
NextTurn 2020-07-25 00:00:00 +08:00 committed by Next Turn
parent 5e50ed79d0
commit 80323eaab8
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/WinSW/WrapperService.cs
View File

@ -273,21 +273,7 @@ namespace WinSW
Log.Error(e); Log.Error(e);
} }
string? startArguments = this.descriptor.StartArguments; string startArguments = this.descriptor.StartArguments ?? this.descriptor.Arguments;
if (startArguments is null)
{
startArguments = this.descriptor.Arguments;
}
else
{
startArguments += " " + this.descriptor.Arguments;
}
// Converting newlines, line returns, tabs into a single
// space. This allows users to provide multi-line arguments
// in the xml for readability.
startArguments = Regex.Replace(startArguments, @"\s*[\n\r]+\s*", " ");
this.LogInfo("Starting " + this.descriptor.Executable); this.LogInfo("Starting " + this.descriptor.Executable);
@ -353,15 +339,12 @@ namespace WinSW
{ {
this.SignalPending(); this.SignalPending();
stopArguments += " " + this.descriptor.Arguments;
Process stopProcess = new Process(); Process stopProcess = new Process();
string? executable = this.descriptor.StopExecutable;
executable ??= this.descriptor.Executable; string stopExecutable = this.descriptor.StopExecutable ?? this.descriptor.Executable;
// TODO: Redirect logging to Log4Net once https://github.com/kohsuke/winsw/pull/213 is integrated // TODO: Redirect logging to Log4Net once https://github.com/kohsuke/winsw/pull/213 is integrated
this.StartProcess(stopProcess, stopArguments, executable, null, false); this.StartProcess(stopProcess, stopArguments, stopExecutable, null, false);
Log.Debug("WaitForProcessToExit " + this.process.Id + "+" + stopProcess.Id); Log.Debug("WaitForProcessToExit " + this.process.Id + "+" + stopProcess.Id);
this.WaitForProcessToExit(this.process); this.WaitForProcessToExit(this.process);