Skip to content

git pull hangs #852 #853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

git pull hangs #852 #853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 39 additions & 10 deletions Bonobo.Git.Server/Git/GitService/GitServiceExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
using System.Web.Mvc;
using System.Linq;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;

namespace Bonobo.Git.Server.Git.GitService
{
Expand Down Expand Up @@ -37,6 +37,12 @@ public GitServiceExecutor(GitServiceExecutorParams parameters, IGitRepositoryLoc
this.repoLocator = repoLocator;
}

private class StreamHelper
{
public Stream FromStream { get; set; }
public Stream ToStream { get; set; }
}

public void ExecuteServiceByName(
string correlationId,
string repositoryName,
Expand Down Expand Up @@ -93,18 +99,41 @@ public void ExecuteServiceByName(

using (var process = Process.Start(info))
{
inStream.CopyTo(process.StandardInput.BaseStream);
if (options.endStreamWithClose) {
process.StandardInput.Close();
} else {
process.StandardInput.Write('\0');
}

process.StandardOutput.BaseStream.CopyTo(outStream);
process.WaitForExit();
var readStreamHelper = new StreamHelper {
FromStream = process.StandardOutput.BaseStream,
ToStream = outStream
};

//Seperate thread for reading the output to prevent a buffer overflow at the 4k console buffer limit
var thrdRead = new Thread((obj) => {
try
{
var strmHelper = (StreamHelper) obj;
strmHelper.FromStream.CopyTo(strmHelper.ToStream);
}
//Extra to prevent error if client disconnected
catch (System.Web.HttpException)
{
}
});

thrdRead.Start(readStreamHelper);

inStream.CopyTo(process.StandardInput.BaseStream);
if (options.endStreamWithClose) {
process.StandardInput.Close();
} else {
process.StandardInput.Write('\0');
}

process.WaitForExit();

thrdRead.Abort();

}
}


private void SetHomePath(ProcessStartInfo info)
{
if (info.EnvironmentVariables.ContainsKey("HOME"))
Expand Down