pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-02-15 04:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #163 from PepperDash/hotfix/ssh-object-disposed-exception

Browse Source 
fix: handles an object disposed ex
This commit is contained in:
Nick Genovese
2023-08-23 14:26:00 -04:00
committed by GitHub
parent 402af2ac17 4f48246061
commit e9a2f7a973
1 changed files with 74 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs
View File

@@ -249,8 +249,6 @@ namespace PepperDash.Core
Debug.Console(1, this, "Creating new SshClient"); Debug.Console(1, this, "Creating new SshClient");
ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth); ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
Client = new SshClient(connectionInfo); Client = new SshClient(connectionInfo);
Client.ErrorOccurred -= Client_ErrorOccurred;
Client.ErrorOccurred += Client_ErrorOccurred; Client.ErrorOccurred += Client_ErrorOccurred;
//Attempt to connect //Attempt to connect
@@ -320,7 +318,7 @@ namespace PepperDash.Core
if (ReconnectTimer != null) if (ReconnectTimer != null)
{ {
ReconnectTimer.Stop(); ReconnectTimer.Stop();
ReconnectTimer = null; // ReconnectTimer = null;
} }
KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY); KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
@@ -333,12 +331,21 @@ namespace PepperDash.Core
{ {
KillStream(); KillStream();
if (Client != null) try
{ {
Client.Disconnect(); if (Client != null)
Client = null; {
ClientStatus = status; Client.ErrorOccurred -= Client_ErrorOccurred;
Debug.Console(1, this, "Disconnected"); Client.Disconnect();
Client.Dispose();
Client = null;
ClientStatus = status;
Debug.Console(1, this, "Disconnected");
}
}
catch (Exception ex)
{
Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Exception in Kill Client:{0}", ex);
} }
} }
@@ -375,14 +382,21 @@ namespace PepperDash.Core
/// </summary> /// </summary>
void KillStream() void KillStream()
{ {
if (TheStream != null) try
{ {
TheStream.DataReceived -= Stream_DataReceived; if (TheStream != null)
TheStream.Close(); {
TheStream.Dispose(); TheStream.DataReceived -= Stream_DataReceived;
TheStream = null; TheStream.Close();
Debug.Console(1, this, "Disconnected stream"); TheStream.Dispose();
} TheStream = null;
Debug.Console(1, this, "Disconnected stream");
}
}
catch (Exception ex)
{
Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Exception in Kill Stream:{0}", ex);
}
} }
/// <summary> /// <summary>
@@ -473,28 +487,39 @@ namespace PepperDash.Core
/// <param name="text"></param> /// <param name="text"></param>
public void SendText(string text) public void SendText(string text)
{ {
try try
{ {
if (Client != null && TheStream != null && IsConnected) if (Client != null && TheStream != null && IsConnected)
{ {
if (StreamDebugging.TxStreamDebuggingIsEnabled) if (StreamDebugging.TxStreamDebuggingIsEnabled)
Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text)); Debug.Console(0,
this,
"Sending {0} characters of text: '{1}'",
text.Length,
ComTextHelper.GetDebugText(text));
TheStream.Write(text); TheStream.Write(text);
TheStream.Flush(); TheStream.Flush();
}
else
{
Debug.Console(1, this, "Client is null or disconnected. Cannot Send Text");
}
}
catch (ObjectDisposedException ex)
{
Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Exception: {0}", ex.Message);
Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Stack Trace: {0}", ex.StackTrace);
} KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
else ReconnectTimer.Reset();
{ }
Debug.Console(1, this, "Client is null or disconnected. Cannot Send Text");
}
}
catch (Exception ex) catch (Exception ex)
{ {
Debug.Console(0, "Exception: {0}", ex.Message); Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Exception: {0}", ex.Message);
Debug.Console(0, "Stack Trace: {0}", ex.StackTrace); Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Stack Trace: {0}", ex.StackTrace);
Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stream write failed. Disconnected, closing"); Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stream write failed");
} }
} }
@@ -518,10 +543,21 @@ namespace PepperDash.Core
{ {
Debug.Console(1, this, "Client is null or disconnected. Cannot Send Bytes"); Debug.Console(1, this, "Client is null or disconnected. Cannot Send Bytes");
} }
} }
catch catch (ObjectDisposedException ex)
{ {
Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stream write failed. Disconnected, closing"); Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Exception: {0}", ex.Message);
Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Stack Trace: {0}", ex.StackTrace);
KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
ReconnectTimer.Reset();
}
catch (Exception ex)
{
Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Exception: {0}", ex.Message);
Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Stack Trace: {0}", ex.StackTrace);
Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stream write failed");
} }
} }