Skip to content

Dev/mirogers/kudu console #3083

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

Merged
hoyosjs merged 6 commits into from
Jan 25, 2023
Merged

Dev/mirogers/kudu console #3083

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d07ac3
added some logging to debug in Kudu
mikelle-rogers May 11, 2022
57b744c
refined the placement of the try catch statement
mikelle-rogers May 24, 2022
b43b6f7
Create NamedPipeEnumerationUnauthorizedException and catch it
mikelle-rogers May 31, 2022
a41cfe7
Merge branch 'dotnet:main' into dev/mirogers/kudu_console
mikelle-rogers Jan 24, 2023
aecce71
fixing suggestions from code review
mikelle-rogers Jan 24, 2023
0fea19a
stick with current exception type and specific message
mikelle-rogers Jan 24, 2023
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
15 changes: 11 additions & 4 deletions src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClient/DiagnosticsClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,9 @@ internal async Task<Dictionary<string, string>> GetProcessEnvironmentAsync(Cance
/// </returns>
public static IEnumerable<int> GetPublishedProcesses()
{
static IEnumerable<int> GetAllPublishedProcesses()
static IEnumerable<int> GetAllPublishedProcesses(string[] files)
{
foreach (var port in Directory.GetFiles(PidIpcEndpoint.IpcRootPath))
foreach (var port in files)
{
var fileName = new FileInfo(port).Name;
var match = Regex.Match(fileName, PidIpcEndpoint.DiagnosticsPortPattern);
Expand All @@ -308,8 +308,15 @@ static IEnumerable<int> GetAllPublishedProcesses()
yield return processId;
}
}

return GetAllPublishedProcesses().Distinct();
try
{
string[] files = Directory.GetFiles(PidIpcEndpoint.IpcRootPath);
return GetAllPublishedProcesses(files).Distinct();
}
catch ( System.UnauthorizedAccessException ex)
{
Console.Error.WriteLine("The user that ran this tool does not have access to the NamedPipes pseudo-filesystem. As a result, this tool will not work.");
}
}

internal ProcessInfo GetProcessInfo()
Expand Down
3 changes: 1 addition & 2 deletions src/Tools/Common/Commands/ProcessStatus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ void FormatTableRows(List<ProcessDetails> rows, StringBuilder tableText)
String cmdLineArgs = GetArgs(process);
cmdLineArgs = cmdLineArgs == process.MainModule?.FileName ? string.Empty : cmdLineArgs;
string fileName = process.MainModule?.FileName ?? string.Empty;

var commandInfo = new ProcessDetails()
{
ProcessId = process.Id,
Expand Down Expand Up @@ -174,7 +173,7 @@ void FormatTableRows(List<ProcessDetails> rows, StringBuilder tableText)
FormatTableRows(printInfo, sb);
console.Out.WriteLine(sb.ToString());
}
catch (InvalidOperationException ex)
catch (InvalidOperationException ex)
{
console.Out.WriteLine(ex.ToString());
}
Expand Down