From f1152c12977b12d795045c5f962c5b7eb2df6fd1 Mon Sep 17 00:00:00 2001 From: Jim Gustafson Date: Mon, 28 Oct 2019 14:10:23 -0700 Subject: [PATCH] Enhance call logging to provide more info For some key operations, change call logging to use the info log level so that it shows up when debugging production log files. Also adding some stub output in cases where it was missing. --- Signal/src/call/CallService.swift | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift index 868894d1f5..133f1cc251 100644 --- a/Signal/src/call/CallService.swift +++ b/Signal/src/call/CallService.swift @@ -255,6 +255,7 @@ private class SignalCallData: NSObject { private func tryToSendIceUpdates() { AssertIsOnMainThread() + Logger.info("") guard !outgoingIceUpdatesInFlight else { Logger.verbose("Enqueued outgoing ice update") @@ -279,6 +280,7 @@ private class SignalCallData: NSObject { let sendPromise = self.messageSender.sendMessage(.promise, callMessage.asPreparer) .done { [weak self] in AssertIsOnMainThread() + Logger.info("sent ice update call message") guard let strongSelf = self else { return @@ -801,7 +803,7 @@ private class SignalCallData: NSObject { */ public func handleRemoteAddedIceCandidate(thread: TSContactThread, callId: UInt64, sdp: String, lineIndex: Int32, mid: String) { AssertIsOnMainThread() - Logger.debug("for callId: \(callId)") + Logger.info("for callId: \(callId)") guard let callData = self.callData, callData.call.signalingId == callId else { @@ -908,6 +910,7 @@ private class SignalCallData: NSObject { */ private func handleRinging() { AssertIsOnMainThread() + Logger.info("") guard let callData = self.callData else { // This will only be called for the current callConnection, so @@ -1202,7 +1205,7 @@ private class SignalCallData: NSObject { let callMessage = OWSOutgoingCallMessage(thread: call.thread, hangupMessage: try hangupBuilder.build()) let sendPromise = messageSender.sendMessage(.promise, callMessage.asPreparer) .done { - Logger.debug("sent hangup call message to \(call.thread.contactAddress)") + Logger.info("sent hangup call message to \(call.thread.contactAddress)") }.ensure { self.terminate(callData: callData) }.catch { error in @@ -1388,6 +1391,7 @@ private class SignalCallData: NSObject { public func callConnection(_ callConnectionParam: CallConnection, onCallEvent event: CallEvent, callId: UInt64) { AssertIsOnMainThread() + Logger.info("") guard let callData = self.callData, callConnectionParam == callData.callConnection else { @@ -1461,7 +1465,7 @@ private class SignalCallData: NSObject { public func callConnection(_ callConnectionParam: CallConnection, onCallError error: String, callId: UInt64) { AssertIsOnMainThread() - Logger.debug("Got an error from RingRTC: \(error)") + Logger.info("Got an error from RingRTC: \(error)") guard let callData = self.callData, callConnectionParam == callData.callConnection else { @@ -1484,7 +1488,7 @@ private class SignalCallData: NSObject { let callMessage = OWSOutgoingCallMessage(thread: call.thread, hangupMessage: try hangupBuilder.build()) let sendPromise = messageSender.sendMessage(.promise, callMessage.asPreparer) .done { - Logger.debug("sent hangup call message to \(call.thread.contactAddress)") + Logger.info("sent hangup call message to \(call.thread.contactAddress)") guard self.callData === callData else { Logger.debug("Ignoring hangup send success for obsolete call.") @@ -1512,6 +1516,7 @@ private class SignalCallData: NSObject { public func callConnection(_ callConnectionParam: CallConnection, onAddRemoteVideoTrack track: RTCVideoTrack, callId: UInt64) { AssertIsOnMainThread() + Logger.info("") guard let callData = self.callData, callConnectionParam == callData.callConnection else { @@ -1533,6 +1538,7 @@ private class SignalCallData: NSObject { public func callConnection(_ callConnectionParam: CallConnection, onUpdateLocalVideoSession session: AVCaptureSession?, callId: UInt64) { AssertIsOnMainThread() + Logger.info("") guard let callData = self.callData, callConnectionParam == callData.callConnection else { @@ -1554,7 +1560,7 @@ private class SignalCallData: NSObject { public func callConnection(_ callConnectionParam: CallConnection, shouldSendOffer sdp: String, callId: UInt64) { AssertIsOnMainThread() - Logger.debug("Got onSendOffer") + Logger.info("") guard let callData = self.callData, callConnectionParam == callData.callConnection else { @@ -1582,7 +1588,7 @@ private class SignalCallData: NSObject { let callMessage = OWSOutgoingCallMessage(thread: call.thread, offerMessage: try offerBuilder.build()) let sendPromise = messageSender.sendMessage(.promise, callMessage.asPreparer) .done { - Logger.debug("sent offer call message to \(call.thread.contactAddress)") + Logger.info("sent offer call message to \(call.thread.contactAddress)") guard self.callData === callData else { Logger.debug("Ignoring call offer send success for obsolete call.") @@ -1616,7 +1622,7 @@ private class SignalCallData: NSObject { public func callConnection(_ callConnectionParam: CallConnection, shouldSendAnswer sdp: String, callId: UInt64) { AssertIsOnMainThread() - Logger.debug("Got onSendAnswer") + Logger.info("") guard let callData = self.callData, callConnectionParam == callData.callConnection else { Logger.debug("Ignoring event from obsolete call.") @@ -1636,7 +1642,7 @@ private class SignalCallData: NSObject { let callMessage = OWSOutgoingCallMessage(thread: call.thread, answerMessage: try answerBuilder.build()) let sendPromise = messageSender.sendMessage(.promise, callMessage.asPreparer) .done { - Logger.debug("sent answer call message to \(call.thread.contactAddress)") + Logger.info("sent answer call message to \(call.thread.contactAddress)") guard self.callData === callData else { Logger.debug("Ignoring call answer send success for obsolete call.") @@ -1670,6 +1676,7 @@ private class SignalCallData: NSObject { public func callConnection(_ callConnectionParam: CallConnection, shouldSendIceCandidates candidates: [RTCIceCandidate], callId: UInt64) { AssertIsOnMainThread() + Logger.info("") guard let callData = self.callData, callConnectionParam == callData.callConnection else { Logger.debug("Ignoring event from obsolete call.") @@ -1694,7 +1701,7 @@ private class SignalCallData: NSObject { public func callConnection(_ callConnectionParam: CallConnection, shouldSendHangup callId: UInt64) { AssertIsOnMainThread() - Logger.debug("Got onSendHangup") + Logger.info("") guard let callData = deferredHangupList.removeValue(forKey: callId) else { owsFailDebug("obsolete call: \(callId)") @@ -1715,7 +1722,7 @@ private class SignalCallData: NSObject { let callMessage = OWSOutgoingCallMessage(thread: call.thread, hangupMessage: try hangupBuilder.build()) let sendPromise = messageSender.sendMessage(.promise, callMessage.asPreparer) .done { - Logger.debug("sent hangup call message to \(call.thread.contactAddress)") + Logger.info("sent hangup call message to \(call.thread.contactAddress)") }.ensure { self.terminate(callData: callData) }.catch { error in @@ -1827,7 +1834,7 @@ private class SignalCallData: NSObject { */ private func terminate(callData: SignalCallData?) { AssertIsOnMainThread() - Logger.debug("") + Logger.info("") callData?.terminate()