Skip to content
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

Jump to bottom

Fix IIS benchmark regression #498

Merged
merged 1 commit into from Jul 11, 2018
Merged

Fix IIS benchmark regression #498

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/BenchmarksServer/Startup.cs
View file
Open in desktop
Expand Up @@ -1647,15 +1647,7 @@ private static async Task<Process> StartProcess(string hostname, string benchmar
arguments += $" --threadCount {job.KestrelThreadCount.Value}";
}

if (iis)
{
Log.WriteLine($"Generating application host config for '{executable} {arguments}'");

var apphost = GenerateApplicationHostConfig(job, "published", executable, arguments, hostname);
arguments = $"-h \"{apphost}\"";
executable = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\inetsrv\w3wp.exe");
}
else
if (!iis)
{
arguments += $" --server.urls {serverUrl}";
}
Expand All @@ -1667,6 +1659,15 @@ private static async Task<Process> StartProcess(string hostname, string benchmar
commandLine += $" {arguments}";
}

if (iis)
{
Log.WriteLine($"Generating application host config for '{executable} {commandLine}'");

var apphost = GenerateApplicationHostConfig(job, "published", executable, commandLine, hostname);
commandLine = $"-h \"{apphost}\"";
executable = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\inetsrv\w3wp.exe");
}

Log.WriteLine($"Invoking executable: {executable}, with arguments: {commandLine}");

var process = new Process()
Expand Down