From d35b735d76af12859046094f4e6896e9f68e9686 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Tue, 23 Oct 2018 08:54:33 -0600
Subject: [PATCH] Log message type in message sender

---
 SignalServiceKit/src/Messages/OWSMessageSender.m | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m
index 7958744a1..47c0887d1 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@@ -1062,7 +1062,8 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
 
     SignalRecipient *recipient = messageSend.recipient;
 
-    OWSLogInfo(@"Message send succeeded.");
+    OWSLogInfo(
+        @"successfully sent message: %@ timestamp: %llu", messageSend.message.class, messageSend.message.timestamp);
 
     if (messageSend.isLocalNumber && deviceMessages.count == 0) {
         OWSLogInfo(@"Sent a message with no device messages; clearing 'mayHaveLinkedDevices'.");
@@ -1105,7 +1106,10 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
     TSOutgoingMessage *message = messageSend.message;
     SignalRecipient *recipient = messageSend.recipient;
 
-    OWSLogInfo(@"sending to recipient: %@, failed with error.", recipient.uniqueId);
+    OWSLogInfo(@"failed to send message: %@, timestamp: %llu, to recipient: %@",
+        message.class,
+        message.timestamp,
+        recipient.uniqueId);
 
     void (^retrySend)(void) = ^void() {
         if (messageSend.remainingAttempts <= 0) {