mirrors/Remotely
3
0
Fork 0
mirror of https://github.com/immense/Remotely.git synced 2025-10-26 11:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #721 from immense/bug/fix-scripting-shell-removal

Browse Source 
Fix removal of scripting shell after error/timeout.
This commit is contained in:
Jared Goodwin 2023-09-01 06:47:42 -07:00 committed by GitHub
commit d4f91a2418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Agent/Services/ExternalScriptingShell.cs
View File

@ -21,7 +21,6 @@ public interface IExternalScriptingShell : IDisposable, IScriptingShell
public class ExternalScriptingShell : IExternalScriptingShell
{
private static readonly ConcurrentDictionary<string, IExternalScriptingShell> _sessions = new();
private readonly IConfigService _configService;
private readonly ILogger<ExternalScriptingShell> _logger;
private readonly ManualResetEvent _outputDone = new(false);
@ -151,7 +150,7 @@ public class ExternalScriptingShell : IExternalScriptingShell
_errorOut += Environment.NewLine + ex.Message;
// Something's wrong. Let the next command start a new session.
RemoveSession();
Dispose();
}
finally
{
@ -167,7 +166,18 @@ public class ExternalScriptingShell : IExternalScriptingShell
{
if (disposing)
{
ShellProcess?.Dispose();
try
{
if (ShellProcess?.HasExited == false)
{
ShellProcess.Kill();
ShellProcess.Dispose();
}
}
catch (Exception ex)
{
_logger.LogError(ex, "Error while disposing scripting shell process.");
}
}
_disposedValue = true;
@ -208,22 +218,12 @@ public class ExternalScriptingShell : IExternalScriptingShell
HadErrors = !string.IsNullOrWhiteSpace(_errorOut) ||
(ShellProcess?.HasExited == true && ShellProcess.ExitCode != 0)
};
RemoveSession();
Dispose();
return partialResult;
}
private void ProcessIdleTimeout_Elapsed(object? sender, ElapsedEventArgs e)
{
RemoveSession();
}
private void RemoveSession()
{
ShellProcess?.Kill();
if (_senderConnectionId is null)
{
return;
}
_sessions.TryRemove(_senderConnectionId, out _);
Dispose();
}
private void ShellProcess_ErrorDataReceived(object sender, DataReceivedEventArgs e)