adding a bit more exception handling · ea974eea5c - SVN.BY: Go Git Service
Browse Source

adding a bit more exception handling

Tiernan OToole 8 years ago
parent
commit
ea974eea5c
1 changed files with 19 additions and 6 deletions
  1. 19 6
      B2Uploader/Program.cs

+ 19 - 6
B2Uploader/Program.cs

@@ -134,8 +134,9 @@ namespace B2Uploader
134 134
                         while (!uploaded && retries < 3)
135 135
                         {
136 136
                             try {
137
-                                var uploadURL = GetUploadURL(new GetUploadURLRequest { bucketId = bucket.bucketId }, auth.apiUrl, auth.authorizationToken).Result;
138
-                                var response = UploadFile(uploadURL.authorizationToken, "b2/x-auto", s, uploadURL.uploadUrl);
137
+                                var uploadURL = GetUploadURL(new GetUploadURLRequest { bucketId = bucket.bucketId }, auth.apiUrl, auth.authorizationToken);
138
+                                Task.WaitAll(uploadURL);
139
+                                var response = UploadFile(uploadURL.Result.authorizationToken, "b2/x-auto", s, uploadURL.Result.uploadUrl);
139 140
                                 if(response != null)
140 141
                                 {
141 142
                                     uploaded = true;
@@ -143,7 +144,13 @@ namespace B2Uploader
143 144
                             }
144 145
                             catch(Exception ex)
145 146
                             {
146
-                                logger.Error("Uploaded Failed. Retrying");
147
+                                logger.Error("Uploaded Failed. {0}, Retrying",ex.Message);
148
+                                var innerEx = ex.InnerException;
149
+                                while(innerEx != null)
150
+                                {
151
+                                    logger.Error("Inner Ex: {0}", innerEx.Message);
152
+                                    innerEx = innerEx.InnerException;
153
+                                }
147 154
                                 logger.Error(ex.Message);
148 155
                                 uploaded = false;
149 156
                                 retries += 1;
@@ -269,9 +276,15 @@ namespace B2Uploader
269 276
                 content = new StringContent(data);
270 277
             }
271 278
             var resp = await client.PostAsync(url, content);
272
-            
273
-            resp.EnsureSuccessStatusCode();
274
-            return await resp.Content.ReadAsStringAsync();          
279
+            try {
280
+                resp.EnsureSuccessStatusCode();
281
+                return await resp.Content.ReadAsStringAsync();
282
+            }
283
+            catch(Exception ex)
284
+            {
285
+                logger.Error("Error getting respoonse: {0} {1}", ex.Message, ex.StackTrace);
286
+                throw;
287
+            }
275 288
         }
276 289
         
277 290