Changeset 383

Timestamp:

05/15/08 03:33:19 (6 months ago)

Author:

tomoyo

Message:

ソケットエラーを表示するようにした。

Location:

TwitterIrcGateway/branches/im-support/TwitterIrcGatewayCore

Files:

• Session.cs (modified) (1 diff)
• TwitterIMService.cs (modified) (5 diffs)

TwitterIrcGateway/branches/im-support/TwitterIrcGatewayCore/Session.cs

@@ -941 +941 @@
             _twitterIm.Logined += new EventHandler(twitterIm_Logined);
             _twitterIm.AuthErrored += new EventHandler(twitterIm_AuthErrored);
+            _twitterIm.SocketErrorHandled += new EventHandler<TwitterIMService.ErrorEventArgs>(twitterIm_SocketErrorHandled);
             _twitterIm.Open();
+        }
+
+        void twitterIm_SocketErrorHandled(object sender, TwitterIMService.ErrorEventArgs e)
+        {
+            SendTwitterGatewayServerMessage("インスタントメッセージングサービスの接続でエラーが発生しました: " + e.Exception.Message);
         }
         void twitterIm_Logined(object sender, EventArgs e)

TwitterIrcGateway/branches/im-support/TwitterIrcGatewayCore/TwitterIMService.cs

@@ -16 +16 @@
         public event EventHandler<StatusUpdateReceivedEventArgs> StatusUpdateReceived;
         public event EventHandler Logined;
-        public event EventHandler ErrorHandled;
+        public event EventHandler<ErrorEventArgs> ErrorHandled;
+        public event EventHandler<ErrorEventArgs> SocketErrorHandled;
         public event EventHandler AuthErrored;
         
@@ -32 +33 @@
             _xmppConnection.OnError += new ErrorHandler(xmppConnection_OnError);
             _xmppConnection.OnMessage += new agsXMPP.protocol.client.MessageHandler(xmppConnection_OnMessage);
+            _xmppConnection.OnSocketError += new ErrorHandler(xmppConnection_OnSocketError);
         }
 
@@ -92 +94 @@
         }
 
+        void xmppConnection_OnSocketError(object sender, Exception ex)
+        {
+            OnSocketErrorHandled(ex);
+        }
+
         void xmppConnection_OnError(object sender, Exception ex)
         {
             Trace.WriteLine(ex);
+            OnErrorHandled(ex);
         }
         #endregion
@@ -104 +112 @@
                 Logined(this, EventArgs.Empty);
         }
-        private void OnErrorHandled()
+        private void OnErrorHandled(Exception ex)
         {
             if (ErrorHandled != null)
-                ErrorHandled(this, EventArgs.Empty);
+                ErrorHandled(this, new ErrorEventArgs(ex));
+        }
+        private void OnSocketErrorHandled(Exception ex)
+        {
+            if (SocketErrorHandled != null)
+                SocketErrorHandled(this, new ErrorEventArgs(ex));
         }
         private void OnAuthErrored()
@@ -118 +131 @@
             if (StatusUpdateReceived != null)
                 StatusUpdateReceived(this, new StatusUpdateReceivedEventArgs(status));
+        }
+
+        public class ErrorEventArgs : EventArgs
+        {
+            public Exception Exception { get; set; }
+
+            public ErrorEventArgs(Exception ex)
+            {
+                this.Exception = ex;
+            }
         }