cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-27 07:04:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #494 from tgstation/Cyberboss-patch-1

Browse Source 
Fixes python stderr not being logged
This commit is contained in:
Jordan Brown
2018-04-05 17:54:29 -04:00
committed by GitHub
parent 78ecfe40d4 2668ffed43
commit 3533d8c861
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGS.Server/Instance/Repository.cs
+6 -5
View File
@@ -1338,12 +1338,12 @@ namespace TGS.Server
python.StartInfo.UseShellExecute = false;
python.StartInfo.WorkingDirectory = new DirectoryInfo(RelativePath(RepoPath)).FullName;
python.StartInfo.RedirectStandardOutput = true;
python.StartInfo.RedirectStandardError = true;
python.Start();
using (StreamReader reader = python.StandardOutput)
{
result = reader.ReadToEnd();
}
using (StreamReader reader = python.StandardError)
result += reader.ReadToEnd();
python.WaitForExit();
exitCode = python.ExitCode;
}
@@ -1364,11 +1364,12 @@ namespace TGS.Server
pip.StartInfo.Arguments = "install " + I;
pip.StartInfo.UseShellExecute = false;
pip.StartInfo.RedirectStandardOutput = true;
pip.StartInfo.RedirectStandardError = true;
pip.Start();
using (StreamReader reader = pip.StandardOutput)
{
result += "\r\n---BEGIN-PIP-OUTPUT---\r\n" + reader.ReadToEnd();
}
using (StreamReader reader = pip.StandardError)
result += reader.ReadToEnd();
pip.WaitForExit();
if (pip.ExitCode != 0)
{