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.

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

Fix dashboard log watching #3636

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Conversation

davidfowl
Copy link
Member

@davidfowl davidfowl commented Apr 12, 2024

  • When the dashboard was running as an executable, the logic we used to detect replicas was broken. Instead of trying to be clever, watch all dashboard resources and log their output. This is more robust and future proof as we only have one dashboard running at once.
  • Deleted the timeout

Fixes #3612

Microsoft Reviewers: Open in CodeFlow

- When the dashboard was running as an executable, the logic we used to detect replics in broken. Instead of trying to be clever, watch all dashboard resources and log their output. This is more robust and future proof as we only have one dashboard running at once.
- Deleted the timeout

Fixes #3612
@davidfowl
Copy link
Member Author

Enabling auto merge, need to get this into p6.

@davidfowl
Copy link
Member Author

/backport to release/8.0

Copy link
Contributor

Started backporting to release/8.0: https://github.com/dotnet/aspire/actions/runs/8656577749

// Wait for dashboard to startup and be reported before giving up.
using var cts = new CancellationTokenSource(timeout);
using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cts.Token, _shutdownCts.Token);
var dashboardResourceTasks = new Dictionary<string, Task>();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be case insesntive. I'm not sure if there is a scenario where the resource service reports the same resource with different casing, but better safe than sorry?

Suggested change
var dashboardResourceTasks = new Dictionary<string, Task>();
var dashboardResourceTasks = new Dictionary<string, Task>(StringComparers.ResourceName);

@davidfowl davidfowl merged commit 52cd9a8 into main Apr 12, 2024
8 checks passed
@davidfowl davidfowl deleted the davidfowl/fix-dashboard-log-watching branch April 12, 2024 04:12
@github-actions github-actions bot locked and limited conversation to collaborators May 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
2 participants