actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2026-03-19 08:48:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR Feedback

Browse Source
This commit is contained in:
Francesco Renzi
2026-03-18 17:00:44 +00:00
committed by GitHub
parent ba771350ac
commit 4dc0a8d1fd
1 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Runner.Worker/Dap/DapDebugger.cs
View File

@@ -105,7 +105,6 @@ namespace GitHub.Runner.Worker.Dap
public Task StartAsync(CancellationToken cancellationToken)
{
ResetSessionState();
var port = ResolvePort();
Trace.Info($"Starting DAP debugger on port {port}");
@@ -426,20 +425,18 @@ namespace GitHub.Runner.Worker.Dap
private async Task ConnectionLoopAsync(CancellationToken cancellationToken)
{
using var listenerCancellationRegistration = cancellationToken.Register(() =>
{
try { _listener?.Stop(); }
catch { /* listener already stopped */ }
});
while (_acceptConnections && !cancellationToken.IsCancellationRequested)
{
try
{
Trace.Info("Waiting for debug client connection...");
using (cancellationToken.Register(() =>
{
try { _listener?.Stop(); }
catch { /* listener already stopped */ }
}))
{
_client = await _listener.AcceptTcpClientAsync();
}
_client = await _listener.AcceptTcpClientAsync();
if (cancellationToken.IsCancellationRequested)
{
@@ -838,26 +835,6 @@ namespace GitHub.Runner.Worker.Dap
return new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
}
private void ResetSessionState()
{
lock (_stateLock)
{
_state = DapSessionState.WaitingForConnection;
_commandTcs = null;
_handshakeTcs = CreateHandshakeCompletionSource();
_pauseOnNextStep = true;
_isFirstStep = true;
_currentStep = null;
_jobContext = null;
_currentStepIndex = 0;
_completedSteps.Clear();
_nextCompletedFrameId = CompletedFrameIdBase;
_isClientConnected = false;
_acceptConnections = true;
_nextSeq = 1;
}
}
private Response HandleInitialize(Request request)
{
if (request.Arguments != null)
@@ -1409,7 +1386,7 @@ namespace GitHub.Runner.Worker.Dap
internal int ResolvePort()
{
var portEnv = Environment.GetEnvironmentVariable(PortEnvironmentVariable);
if (!string.IsNullOrEmpty(portEnv) && int.TryParse(portEnv, out var customPort) && customPort > 0 && customPort <= 65535)
if (!string.IsNullOrEmpty(portEnv) && int.TryParse(portEnv, out var customPort) && customPort > 1024 && customPort <= 65535)
{
Trace.Info($"Using custom DAP port {customPort} from {PortEnvironmentVariable}");
return customPort;