Changeset 243565 in webkit

Timestamp:

Mar 27, 2019, 2:48:04 PM (7 years ago)

Author:

Keith Rollin

Message:

Include the CFNetworking task UUID to the NSError when a resource-load fails
​https://bugs.webkit.org/show_bug.cgi?id=196156

Reviewed by Alex Christensen.

In order to help track the connection between a failed resource-load
and a user-visible error message, include the CFNetworking task UUID
in the associated error as an element of the userInfo property. This
can then be pulled out and reported in the logging at the point the
error is reported to the user.

• NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(-[WKNetworkSessionDelegate URLSession:task:didCompleteWithError:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-27  Keith Rollin  <krollin@apple.com>
+
+        Include the CFNetworking task UUID to the NSError when a resource-load fails
+        https://bugs.webkit.org/show_bug.cgi?id=196156
+
+        Reviewed by Alex Christensen.
+
+        In order to help track the connection between a failed resource-load
+        and a user-visible error message, include the CFNetworking task UUID
+        in the associated error as an element of the userInfo property. This
+        can then be pulled out and reported in the logging at the point the
+        error is reported to the user.
+
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (-[WKNetworkSessionDelegate URLSession:task:didCompleteWithError:]):
+
 2019-03-27  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

@@ -607 +607 @@
 
     LOG(NetworkSession, "%llu didCompleteWithError %@", task.taskIdentifier, error);
+
+    if (error) {
+        NSDictionary *oldUserInfo = [error userInfo];
+        NSMutableDictionary *newUserInfo = oldUserInfo ? [NSMutableDictionary dictionaryWithDictionary:oldUserInfo] : [NSMutableDictionary dictionary];
+        newUserInfo[@"networkTaskDescription"] = [task description];
+        error = [NSError errorWithDomain:[error domain] code:[error code] userInfo:newUserInfo];
+    }
+
     if (auto* networkDataTask = [self existingTask:task])
         networkDataTask->didCompleteWithError(error, networkDataTask->networkLoadMetrics());