Merge branch 'mkirk/more-logging' into release/2.31.0

SignalServiceKit/src/Network/API/OWSUploadOperation.m

@@ -168,7 +168,10 @@ static const CGFloat kAttachmentUploadProgressTheta = 0.001f;
                 return;
             }
 
-            OWSLogInfo(@"Uploaded attachment: %p.", attachmentStream.uniqueId);
+            OWSLogInfo(@"Uploaded attachment: %p serverId: %llu, byteCount: %u",
+                attachmentStream.uniqueId,
+                attachmentStream.serverId,
+                attachmentStream.byteCount);
             attachmentStream.serverId = serverId;
             attachmentStream.isUploaded = YES;
             [attachmentStream saveAsyncWithCompletionBlock:^{

SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m

@@ -143,6 +143,16 @@ NSString *const kNSNotification_OWSWebSocketStateDidChange = @"kNSNotification_O
 
 #pragma mark -
 
+NSString *NSStringFromOWSWebSocketType(OWSWebSocketType type)
+{
+    switch (type) {
+        case OWSWebSocketTypeDefault:
+            return @"Default";
+        case OWSWebSocketTypeUD:
+            return @"UD";
+    }
+}
+
 // OWSWebSocket's properties should only be accessed from the main thread.
 @interface OWSWebSocket () <SRWebSocketDelegate>
 
@@ -563,11 +573,12 @@ NSString *const kNSNotification_OWSWebSocketStateDidChange = @"kNSNotification_O
         [socketMessage didFailBeforeSending];
         return;
     }
-    OWSLogVerbose(@"message scheduled: %llu, %@, %@, %zd.",
+    OWSLogInfo(@"making request: %llu, %@: %@, jsonData.length: %zd, socketType: %@",
         socketMessage.requestId,
         request.HTTPMethod,
         requestPath,
-        jsonData.length);
+        jsonData.length,
+        NSStringFromOWSWebSocketType(self.webSocketType));
 
     const int64_t kSocketTimeoutSeconds = 10;
     __weak TSSocketMessage *weakSocketMessage = socketMessage;
@@ -592,7 +603,7 @@ NSString *const kNSNotification_OWSWebSocketStateDidChange = @"kNSNotification_O
 {
     OWSAssertDebug(message);
 
-    OWSLogInfo(@"received WebSocket response.");
+    OWSLogInfo(@"received WebSocket response requestId: %llu, status: %u", message.requestID, message.status);
 
     DispatchMainThreadSafe(^{
         [self requestSocketAliveForAtLeastSeconds:kMakeRequestKeepSocketAliveDurationSeconds];