diff options
| author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2017-04-11 23:36:31 +0300 |
|---|---|---|
| committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2017-04-11 23:36:31 +0300 |
| commit | 26572d95454a27b72a7a113168a36a38cf6e63e6 (patch) | |
| tree | 2a98123dd43e3e244df8d7e4654a8bfa9f459ece /Clovershell | |
| parent | 8dca8a8b414d4f95c3bfce70ca91e6829679cf7a (diff) | |
Many minor fixes. Ready to rock! Waiting for translators.
Diffstat (limited to 'Clovershell')
| -rw-r--r-- | Clovershell/ClovershellConnection.cs | 8 | ||||
| -rw-r--r-- | Clovershell/ShellConnection.cs | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Clovershell/ClovershellConnection.cs b/Clovershell/ClovershellConnection.cs index 1fbbc884..ae247c90 100644 --- a/Clovershell/ClovershellConnection.cs +++ b/Clovershell/ClovershellConnection.cs @@ -262,7 +262,7 @@ namespace com.clusterrr.clovershell }
catch (ClovershellException ex)
{
- Debug.WriteLine(ex.Message);
+ Debug.WriteLine(ex.Message + ex.StackTrace);
break;
}
}
@@ -462,8 +462,10 @@ namespace com.clusterrr.clovershell }
catch (ClovershellException ex)
{
+ Debug.WriteLine(ex.Message + ex.StackTrace);
+ if (connection.socket.Connected)
+ connection.socket.Send(Encoding.ASCII.GetBytes("Error: " + ex.Message));
connection.Dispose();
- Debug.WriteLine("Error: " + ex.Message + ex.StackTrace);
}
}
}
@@ -473,7 +475,7 @@ namespace com.clusterrr.clovershell }
catch (ClovershellException ex)
{
- Debug.WriteLine(ex.Message);
+ Debug.WriteLine(ex.Message + ex.StackTrace);
}
finally
{
diff --git a/Clovershell/ShellConnection.cs b/Clovershell/ShellConnection.cs index 68178040..abd4eba4 100644 --- a/Clovershell/ShellConnection.cs +++ b/Clovershell/ShellConnection.cs @@ -11,7 +11,7 @@ namespace com.clusterrr.clovershell internal class ShellConnection : IDisposable
{
public readonly ClovershellConnection connection;
- Socket socket;
+ internal Socket socket;
internal int id;
internal Thread shellConnectionThread;
@@ -82,8 +82,11 @@ namespace com.clusterrr.clovershell catch (ThreadAbortException)
{
}
- catch (ClovershellException)
+ catch (ClovershellException ex)
{
+ Debug.WriteLine(ex.Message + ex.StackTrace);
+ if (socket.Connected)
+ socket.Send(Encoding.ASCII.GetBytes("Error: " + ex.Message));
}
finally
{
|