Twitterへのアクセスエラーの際にメソッド名も表示するようにした

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@756 e39ad16e-3079-482e-bb30-4b4d378143b6

diff --git a/Tween/Twitter.vb b/Tween/Twitter.vb
index 32ada4b..e4ed062 100644 (file)
--- a/Tween/Twitter.vb
+++ b/Tween/Twitter.vb
@@ -30,6 +30,7 @@ Imports System.Text.RegularExpressions
 Imports System.Globalization
 Imports System.Diagnostics
 Imports System.Net
+Imports System.Reflection
 
 Public Class Twitter
     Delegate Sub GetIconImageDelegate(ByVal post As PostClass)
@@ -105,7 +106,7 @@ Public Class Twitter
                     Return "Err:Forbidden"
                 End Try
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
     End Function
@@ -422,12 +423,12 @@ Public Class Twitter
                 HttpStatusCode.RequestTimeout, _
                 HttpStatusCode.RequestUriTooLong
                 '仕様書にない400系エラー。サーバまでは到達しているのでリトライしない
-                Return "Warn:" + res.ToString
+                Return "Warn:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
             Case HttpStatusCode.Unauthorized
                 Twitter.AccountState = ACCOUNT_STATE.Invalid
                 Return "Check your Username/Password."
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -507,7 +508,7 @@ Public Class Twitter
                 Twitter.AccountState = ACCOUNT_STATE.Invalid
                 Return "Check your Username/Password."
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -534,7 +535,7 @@ Public Class Twitter
             Case HttpStatusCode.NotFound
                 Return ""
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
     End Function
@@ -562,7 +563,7 @@ Public Class Twitter
                 Twitter.AccountState = ACCOUNT_STATE.Invalid
                 Return "Check your Username/Password."
             Case Is <> HttpStatusCode.OK
-                Return "Err:" + res.ToString()
+                Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
         Twitter.AccountState = ACCOUNT_STATE.Valid
@@ -689,7 +690,7 @@ Public Class Twitter
             Case HttpStatusCode.NotFound
                 Return ""
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -721,12 +722,12 @@ Public Class Twitter
                     xd.LoadXml(content)
                     Dim xNode As XmlNode = Nothing
                     xNode = xd.SelectSingleNode("/hash/error")
-                    Return "Err:" + xNode.InnerText
+                    Return "Err:" + xNode.InnerText + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 Catch ex As Exception
-                    Return "Err:Forbidden"
+                    Return "Err:Forbidden" + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 End Try
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -742,7 +743,7 @@ Public Class Twitter
         Try
             res = twCon.DestroyFriendships(screenName, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -758,12 +759,12 @@ Public Class Twitter
                     xd.LoadXml(content)
                     Dim xNode As XmlNode = Nothing
                     xNode = xd.SelectSingleNode("/hash/error")
-                    Return "Err:" + xNode.InnerText
+                    Return "Err:" + xNode.InnerText + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 Catch ex As Exception
-                    Return "Err:Forbidden"
+                    Return "Err:Forbidden" + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 End Try
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -779,7 +780,7 @@ Public Class Twitter
         Try
             res = twCon.CreateBlock(screenName, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -795,12 +796,12 @@ Public Class Twitter
                     xd.LoadXml(content)
                     Dim xNode As XmlNode = Nothing
                     xNode = xd.SelectSingleNode("/hash/error")
-                    Return "Err:" + xNode.InnerText
+                    Return "Err:" + xNode.InnerText + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 Catch ex As Exception
-                    Return "Err:Forbidden"
+                    Return "Err:Forbidden" + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 End Try
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -816,7 +817,7 @@ Public Class Twitter
         Try
             res = twCon.DestroyBlock(screenName, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -832,12 +833,12 @@ Public Class Twitter
                     xd.LoadXml(content)
                     Dim xNode As XmlNode = Nothing
                     xNode = xd.SelectSingleNode("/hash/error")
-                    Return "Err:" + xNode.InnerText
+                    Return "Err:" + xNode.InnerText + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 Catch ex As Exception
-                    Return "Err:Forbidden"
+                    Return "Err:Forbidden" + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 End Try
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -853,7 +854,7 @@ Public Class Twitter
         Try
             res = twCon.ReportSpam(screenName, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -869,12 +870,12 @@ Public Class Twitter
                     xd.LoadXml(content)
                     Dim xNode As XmlNode = Nothing
                     xNode = xd.SelectSingleNode("/hash/error")
-                    Return "Err:" + xNode.InnerText
+                    Return "Err:" + xNode.InnerText + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 Catch ex As Exception
-                    Return "Err:Forbidden"
+                    Return "Err:Forbidden" + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 End Try
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -889,7 +890,7 @@ Public Class Twitter
         Try
             res = twCon.ShowFriendships(_uid, screenName, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -911,7 +912,7 @@ Public Class Twitter
                 Twitter.AccountState = ACCOUNT_STATE.Invalid
                 Return "Check your Username/Password."
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -927,7 +928,7 @@ Public Class Twitter
         Try
             res = twCon.ShowUserInfo(screenName, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -949,7 +950,7 @@ Public Class Twitter
                 Twitter.AccountState = ACCOUNT_STATE.Invalid
                 Return "Check your Username/Password."
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -999,7 +1000,7 @@ Public Class Twitter
                     Return "Check your Username/Password."
                 Case Else
                     retweeted_count = -1
-                    Return "Err:" + res.ToString
+                    Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
             End Select
         Next
         Return ""
@@ -1015,7 +1016,7 @@ Public Class Twitter
         Try
             res = twCon.CreateFavorites(id, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -1031,12 +1032,12 @@ Public Class Twitter
                     xd.LoadXml(content)
                     Dim xNode As XmlNode = Nothing
                     xNode = xd.SelectSingleNode("/hash/error")
-                    Return "Err:" + xNode.InnerText
+                    Return "Err:" + xNode.InnerText + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 Catch ex As Exception
-                    Return "Err:Forbidden"
+                    Return "Err:Forbidden" + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 End Try
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
         'http://twitter.com/statuses/show/id.xml APIを発行して本文を取得
@@ -1078,7 +1079,7 @@ Public Class Twitter
             Case HttpStatusCode.BadRequest
                 Return "Err:API Limits?"
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
     End Function
@@ -1114,7 +1115,7 @@ Public Class Twitter
                     Return "Err:Forbidden"
                 End Try
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -1144,12 +1145,12 @@ Public Class Twitter
                     xd.LoadXml(content)
                     Dim xNode As XmlNode = Nothing
                     xNode = xd.SelectSingleNode("/hash/error")
-                    Return "Err:" + xNode.InnerText
+                    Return "Err:" + xNode.InnerText + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 Catch ex As Exception
-                    Return "Err:Forbidden"
+                    Return "Err:Forbidden" + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 End Try
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -1163,7 +1164,7 @@ Public Class Twitter
         Try
             res = twCon.UpdateProfileImage(New FileInfo(filename), content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -1179,12 +1180,12 @@ Public Class Twitter
                     xd.LoadXml(content)
                     Dim xNode As XmlNode = Nothing
                     xNode = xd.SelectSingleNode("/hash/error")
-                    Return "Err:" + xNode.InnerText
+                    Return "Err:" + xNode.InnerText + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 Catch ex As Exception
-                    Return "Err:Forbidden"
+                    Return "Err:Forbidden" + "(" + MethodBase.GetCurrentMethod.ToString + ")"
                 End Try
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
     End Function
 
@@ -1392,7 +1393,7 @@ Public Class Twitter
             Case HttpStatusCode.BadRequest
                 Return "Err:API Limits?"
             Case Else
-                Return "Err:" + res.ToString()
+                Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
         If gType = WORKERTYPE.Timeline Then
@@ -1431,7 +1432,7 @@ Public Class Twitter
             Case HttpStatusCode.BadRequest
                 Return "Err:API Limits?"
             Case Else
-                Return "Err:" + res.ToString()
+                Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
         Return CreatePostsFromXml(content, WORKERTYPE.List, tab, read, countQuery, tab.OldestId)
@@ -1609,7 +1610,7 @@ Public Class Twitter
                 Return "Search API Limit?"
             Case HttpStatusCode.OK
             Case Else
-                Return "Err:" + res.ToString
+                Return "Err:" + res.ToString + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
         If Not TabInformations.GetInstance.ContainsTab(tab) Then Return ""
@@ -1741,7 +1742,7 @@ Public Class Twitter
             Case HttpStatusCode.BadRequest
                 Return "Err:API Limits?"
             Case Else
-                Return "Err:" + res.ToString()
+                Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
         Dim arIdx As Integer = -1
@@ -1844,7 +1845,7 @@ Public Class Twitter
         Try
             res = twCon.Favorites(_countApi, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -1856,7 +1857,7 @@ Public Class Twitter
             Case HttpStatusCode.BadRequest
                 Return "Err:API Limits?"
             Case Else
-                Return "Err:" + res.ToString()
+                Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
         Dim arIdx As Integer = -1
@@ -2017,7 +2018,7 @@ Public Class Twitter
         Try
             res = twCon.FollowerIds(cursor, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -2029,7 +2030,7 @@ Public Class Twitter
             Case HttpStatusCode.BadRequest
                 Return "Err:API Limits?"
             Case Else
-                Return "Err:" + res.ToString()
+                Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
         Dim xdoc As New XmlDocument
@@ -2066,7 +2067,7 @@ Public Class Twitter
             Try
                 res = twCon.GetLists(Me.Username, cursor, content)
             Catch ex As Exception
-                Return "Err:" + ex.Message
+                Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
             End Try
 
             Select Case res
@@ -2078,7 +2079,7 @@ Public Class Twitter
                 Case HttpStatusCode.BadRequest
                     Return "Err:API Limits?"
                 Case Else
-                    Return "Err:" + res.ToString()
+                    Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
             End Select
 
             Dim xdoc As New XmlDocument
@@ -2106,7 +2107,7 @@ Public Class Twitter
             Try
                 res = twCon.GetListsSubscriptions(Me.Username, cursor, content)
             Catch ex As Exception
-                Return "Err:" + ex.Message
+                Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
             End Try
 
             Select Case res
@@ -2118,7 +2119,7 @@ Public Class Twitter
                 Case HttpStatusCode.BadRequest
                     Return "Err:API Limits?"
                 Case Else
-                    Return "Err:" + res.ToString()
+                    Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
             End Select
 
             Dim xdoc As New XmlDocument
@@ -2151,7 +2152,7 @@ Public Class Twitter
         Try
             res = twCon.DeleteListID(Me.Username, list_id, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -2163,7 +2164,7 @@ Public Class Twitter
             Case HttpStatusCode.BadRequest
                 Return "Err:API Limits?"
             Case Else
-                Return "Err:" + res.ToString()
+                Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
         Return ""
@@ -2180,7 +2181,7 @@ Public Class Twitter
         Try
             res = twCon.PostListID(Me.Username, list_id, new_name, modeString, description, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -2192,7 +2193,7 @@ Public Class Twitter
             Case HttpStatusCode.BadRequest
                 Return "Err:API Limits?"
             Case Else
-                Return "Err:" + res.ToString()
+                Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
         Dim xdoc As New XmlDocument
@@ -2240,7 +2241,7 @@ Public Class Twitter
                 Case HttpStatusCode.BadRequest
                     Return "Err:API Limits?"
                 Case Else
-                    Return "Err:" + res.ToString()
+                    Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
             End Select
 
             Dim xdoc As New XmlDocument
@@ -2274,7 +2275,7 @@ Public Class Twitter
         Try
             res = twCon.PostLists(Me.Username, listName, isPrivate, description, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -2286,7 +2287,7 @@ Public Class Twitter
             Case HttpStatusCode.BadRequest
                 Return "Err:API Limits?"
             Case Else
-                Return "Err:" + res.ToString()
+                Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
         Dim xdoc As New XmlDocument
@@ -2313,7 +2314,7 @@ Public Class Twitter
         Try
             res = Me.twCon.GetListMembersID(Me.Username, list_name, user, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Select Case res
@@ -2328,7 +2329,7 @@ Public Class Twitter
                 value = False
                 Return ""
             Case Else
-                Return "Err:" + res.ToString()
+                Return "Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Select
 
         Dim xdoc As New XmlDocument
@@ -2350,7 +2351,7 @@ Public Class Twitter
         Try
             res = twCon.PostListMembers(Me.Username, list_name, user, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Return ""
@@ -2363,7 +2364,7 @@ Public Class Twitter
         Try
             res = twCon.DeleteListMembers(Me.Username, list_name, user, content)
         Catch ex As Exception
-            Return "Err:" + ex.Message
+            Return "Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod.ToString + ")"
         End Try
 
         Return ""