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

Remove `/redirect` option

pull/557/head
NextTurn 2020-02-17 00:00:00 +08:00 committed by Next Turn
parent 3b2a9354c0
commit eac8b8ca45
3 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,20 +88,7 @@ namespace winsw
return;
}
var args = new List<string>(Array.AsReadOnly(argsArray));
if (args[0] == "/redirect")
{
var f = new FileStream(args[1], FileMode.Create);
var w = new StreamWriter(f) { AutoFlush = true };
Console.SetOut(w);
Console.SetError(w);
var handle = f.SafeFileHandle;
_ = Kernel32.SetStdHandle(-11, handle); // set stdout
_ = Kernel32.SetStdHandle(-12, handle); // set stder
args = args.GetRange(2, args.Count - 2);
}
var args = new List<string>(argsArray);
bool elevated;
if (args[0] == "/elevated")
@ -692,9 +679,6 @@ namespace winsw
Console.WriteLine();
PrintAvailableCommands();
Console.WriteLine();
Console.WriteLine("Extra options:");
Console.WriteLine(" /redirect redirect the wrapper's STDOUT and STDERR to the specified file");
Console.WriteLine();
PrintVersion();
Console.WriteLine("More info: https://github.com/winsw/winsw");
Console.WriteLine("Bug tracker: https://github.com/winsw/winsw/issues");

11
src/Core/WinSWCore/Native/Kernel32.cs
View File

@ -1,11 +0,0 @@
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;
namespace winsw.Native
{
internal static class Kernel32
{
[DllImport(Libraries.Kernel32)]
internal static extern bool SetStdHandle(int stdHandle, SafeFileHandle handle);
}
}

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

@ -51,9 +51,6 @@ namespace winswTests
Assert.That(cliOut, Does.Contain("help"));
Assert.That(cliOut, Does.Contain("version"));
// TODO: check all commands after the migration of ccommands to enum
// Extra options
Assert.That(cliOut, Does.Contain("/redirect"));
}
[Test]