Handle shifupool timeout errors. Catch errors coming from connection …

…providers
De-Crypted · Apr 20, 2022 · 3bd202f · 3bd202f
1 parent dad1540
commit 3bd202f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Managers/ConnectionManager.cs b/Managers/ConnectionManager.cs
@@ -64,7 +64,12 @@ public Task StartAsync(CancellationToken cancellationToken)
                         SafeConsole.WriteLine(ConsoleColor.DarkGray, "{0:T}: Connecting to {1}", DateTime.Now, _url);
 
                         CurrentProvider = GetConnectionProvider(_url);
-                        await CurrentProvider.RunAsync(_url);
+
+                        try {
+                            await CurrentProvider.RunAsync(_url);
+                        } catch (Exception ex) {
+                            SafeConsole.WriteLine(ConsoleColor.DarkRed, ex.ToString());
+                        }
 
                         SafeConsole.WriteLine(ConsoleColor.DarkGray, "{0:T}: Disconnected from {1}", DateTime.Now, _url);
                     }

diff --git a/Managers/StatusManager.cs b/Managers/StatusManager.cs
@@ -149,7 +149,7 @@ public static void DoPeriodicReport()
         public static void PrintHelp()
         {
             var helpMsg = @"|---------------------------------------|
-| Available hotkeys                     |
+| Hotkeys                     |
 |---------------------------------------|
 | H     Print this help                 |
 | P     Pause mining                    |                    

diff --git a/TcpClient/AsyncTcpClient.cs b/TcpClient/AsyncTcpClient.cs
@@ -253,6 +253,12 @@ public async Task RunAsync()
 							Message?.Invoke(this, new AsyncTcpEventArgs("Connection reset remotely", ex));
 							readLength = -2;
 						}
+						catch (IOException ex) when ((ex.InnerException as SocketException)?.ErrorCode == (int)SocketError.TimedOut)
+						{
+							Message?.Invoke(this, new AsyncTcpEventArgs("Connection timed out", ex));
+							readLength = -1;
+						}
+
 						if (readLength <= 0)
 						{
 							if (readLength == 0)