diff --git a/Chaskis/ChaskisCore/IrcConnection.cs b/Chaskis/ChaskisCore/IrcConnection.cs index 93305b7c..dd03977c 100644 --- a/Chaskis/ChaskisCore/IrcConnection.cs +++ b/Chaskis/ChaskisCore/IrcConnection.cs @@ -694,24 +694,7 @@ private void ReaderThread() } } } - catch( SocketException err ) - { - StaticLogger.Log.WriteLine( "IRC Connection closed: " + err.Message ); - if( this.KeepReading ) - { - StaticLogger.Log.ErrorWriteLine( - "WARNING IRC connection closed, but we weren't terminating. Wait for watchdog to reconnect..." - ); - return; - } - else - { - // We requested the irc connection be closed since KeepReading is false. - // Return, which will terminate this thread. - return; - } - } - catch( IOException err ) + catch( Exception err ) { StaticLogger.Log.WriteLine( "IRC Connection closed: " + err.Message ); if( this.KeepReading ) @@ -728,16 +711,6 @@ private void ReaderThread() return; } } - catch( Exception err ) - { - // Unexpected exception occurred. The connection probably dropped. - // Nothing we can do now except to wait for the watch dog to trigger a reconnect.. - StaticLogger.Log.ErrorWriteLine( - "IRC Reader Thread caught unexpected exception:" + Environment.NewLine + err + Environment.NewLine + "Wait for watchdog to reconnect..." - ); - - return; - } } // End While } catch( Exception err )