uo9xpb74
/
tye
forked from tsai/tye
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Build sequentially instead of in parallel. (#324)

davidfowl/aspnet-urls
Justin Kotalik 7 years ago
committed by GitHub
parent
703e5398d7
commit
ef11ab13e8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 74 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 136
      src/Microsoft.Tye.Hosting/ProcessRunner.cs

136
src/Microsoft.Tye.Hosting/ProcessRunner.cs
View File

@ -35,20 +35,7 @@ namespace Microsoft.Tye.Hosting
{ {
await PurgeFromPreviousRun(); await PurgeFromPreviousRun();
var tasks = new Task[application.Services.Count]; await BuildAndRunProjects(application);
var index = 0;
foreach (var s in application.Services)
{
tasks[index++] = s.Value.ServiceType switch
{
ServiceType.Executable => LaunchService(application, s.Value),
ServiceType.Project => LaunchService(application, s.Value),
_ => Task.CompletedTask,
};
}
await Task.WhenAll(tasks);
} }
public Task StopAsync(Application application) public Task StopAsync(Application application)
@ -56,67 +43,92 @@ namespace Microsoft.Tye.Hosting
return KillRunningProcesses(application.Services); return KillRunningProcesses(application.Services);
} }
private async Task LaunchService(Application application, Service service) private async Task BuildAndRunProjects(Application application)
{ {
var serviceDescription = service.Description; foreach (var service in application.Services.Values)
var serviceName = serviceDescription.Name;
var path = "";
var workingDirectory = "";
var args = "";
if (serviceDescription.RunInfo is ProjectRunInfo project)
{ {
path = project.RunCommand; var serviceDescription = service.Description;
workingDirectory = project.ProjectFile.Directory.FullName;
args = project.Args == null ? project.RunArguments : project.RunArguments + " " + project.Args;
service.Status.ProjectFilePath = project.ProjectFile.FullName;
}
else if (serviceDescription.RunInfo is ExecutableRunInfo executable)
{
path = executable.Executable;
workingDirectory = executable.WorkingDirectory!;
args = executable.Args ?? "";
}
else
{
throw new InvalidOperationException("Unsupported ServiceType.");
}
// If this is a dll then use dotnet to run it string path;
if (Path.GetExtension(path) == ".dll") string args;
{ string workingDirectory;
args = $"\"{path}\" {args}".Trim(); if (serviceDescription.RunInfo is ProjectRunInfo project)
path = "dotnet"; {
} path = project.RunCommand;
workingDirectory = project.ProjectFile.Directory.FullName;
args = project.Args == null ? project.RunArguments : project.RunArguments + " " + project.Args;
service.Status.ProjectFilePath = project.ProjectFile.FullName;
}
else if (serviceDescription.RunInfo is ExecutableRunInfo executable)
{
path = executable.Executable;
workingDirectory = executable.WorkingDirectory!;
args = executable.Args ?? "";
}
else
{
continue;
}
service.Status.ExecutablePath = path; // If this is a dll then use dotnet to run it
service.Status.WorkingDirectory = workingDirectory; if (Path.GetExtension(path) == ".dll")
service.Status.Args = args; {
args = $"\"{path}\" {args}".Trim();
path = "dotnet";
}
var processInfo = new ProcessInfo(new Task[service.Description.Replicas]); service.Status.ExecutablePath = path;
service.Status.WorkingDirectory = workingDirectory;
service.Status.Args = args;
if (service.Status.ProjectFilePath != null && // TODO instead of always building with projects, try building with sln if available.
service.Description.RunInfo is ProjectRunInfo project2 && if (service.Status.ProjectFilePath != null &&
project2.Build && service.Description.RunInfo is ProjectRunInfo project2 &&
_options.BuildProjects) project2.Build &&
{ _options.BuildProjects)
// Sometimes building can fail because of file locking (like files being open in VS) {
_logger.LogInformation("Building project {ProjectFile}", service.Status.ProjectFilePath); // Sometimes building can fail because of file locking (like files being open in VS)
_logger.LogInformation("Building project {ProjectFile}", service.Status.ProjectFilePath);
service.Logs.OnNext($"dotnet build \"{service.Status.ProjectFilePath}\" /nologo"); service.Logs.OnNext($"dotnet build \"{service.Status.ProjectFilePath}\" /nologo");
var buildResult = await ProcessUtil.RunAsync("dotnet", $"build \"{service.Status.ProjectFilePath}\" /nologo", throwOnError: false, workingDirectory: workingDirectory); var buildResult = await ProcessUtil.RunAsync("dotnet", $"build \"{service.Status.ProjectFilePath}\" /nologo", throwOnError: false, workingDirectory: workingDirectory);
service.Logs.OnNext(buildResult.StandardOutput); service.Logs.OnNext(buildResult.StandardOutput);
if (buildResult.ExitCode != 0) if (buildResult.ExitCode != 0)
{ {
_logger.LogInformation("Building {ProjectFile} failed with exit code {ExitCode}: \r\n" + buildResult.StandardOutput, service.Status.ProjectFilePath, buildResult.ExitCode); _logger.LogInformation("Building {ProjectFile} failed with exit code {ExitCode}: \r\n" + buildResult.StandardOutput, service.Status.ProjectFilePath, buildResult.ExitCode);
return; return;
}
} }
} }
foreach (var s in application.Services)
{
switch (s.Value.ServiceType)
{
case ServiceType.Executable:
LaunchService(application, s.Value);
break;
case ServiceType.Project:
LaunchService(application, s.Value);
break;
};
}
}
private void LaunchService(Application application, Service service)
{
var serviceDescription = service.Description;
var processInfo = new ProcessInfo(new Task[service.Description.Replicas]);
var serviceName = serviceDescription.Name;
// Set by BuildAndRunService
var args = service.Status.Args!;
var path = service.Status.ExecutablePath!;
var workingDirectory = service.Status.WorkingDirectory!;
async Task RunApplicationAsync(IEnumerable<(int ExternalPort, int Port, string? Protocol)> ports) async Task RunApplicationAsync(IEnumerable<(int ExternalPort, int Port, string? Protocol)> ports)
{ {
// Make sure we yield before trying to start the process, this is important so we don't block startup // Make sure we yield before trying to start the process, this is important so we don't block startup

Write Preview
Loading…
Cancel
Save