Combine double log invocations

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/WireGuard/WireGuard/Tunnel/TunnelsManager.swift b/WireGuard/WireGuard/Tunnel/TunnelsManager.swift
index bf5ab526b7819d18b3c7e145e5426a5ebee94896..4913fd2b906b217b0fdd1f6b63627bc2c0a3039d 100644 (file)
--- a/WireGuard/WireGuard/Tunnel/TunnelsManager.swift
+++ b/WireGuard/WireGuard/Tunnel/TunnelsManager.swift
@@ -395,8 +395,7 @@ class TunnelContainer: NSObject {
                     activationDelegate?.tunnelActivationAttemptFailed(tunnel: self, error: .failedWhileSaving(systemError: error!))
                     return
                 }
-                wg_log(.debug, staticMessage: "startActivation: Tunnel saved after re-enabling")
-                wg_log(.debug, staticMessage: "startActivation: Invoking startActivation")
+                wg_log(.debug, staticMessage: "startActivation: Tunnel saved after re-enabling, invoking startActivation")
                 self.startActivation(recursionCount: recursionCount + 1, lastError: NEVPNError(NEVPNError.configurationUnknown), activationDelegate: activationDelegate)
             }
             return
@@ -434,8 +433,7 @@ class TunnelContainer: NSObject {
                     activationDelegate?.tunnelActivationAttemptFailed(tunnel: self, error: .failedWhileLoading(systemError: systemError))
                     return
                 }
-                wg_log(.debug, staticMessage: "startActivation: Tunnel reloaded")
-                wg_log(.debug, staticMessage: "startActivation: Invoking startActivation")
+                wg_log(.debug, staticMessage: "startActivation: Tunnel reloaded, invoking startActivation")
                 self.startActivation(recursionCount: recursionCount + 1, lastError: systemError, activationDelegate: activationDelegate)
             }
         }

diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
index 7a461c423bab69926653e434883c7ce987587a69..bcec9b26eb2b2bc0ce5e77566110b616c410b707 100644 (file)
--- a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
+++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
@@ -66,7 +66,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
 
         let handle = wireguardSettings.withGoString { return wgTurnOn($0, fileDescriptor) }
         if handle < 0 {
-            wg_log(.error, staticMessage: "Starting tunnel failed: Could not start WireGuard")
+            wg_log(.error, message: "Starting tunnel failed with wgTurnOn returning \(handle)")
             errorNotifier.notify(PacketTunnelProviderError.couldNotStartWireGuard)
             startTunnelCompletionHandler(PacketTunnelProviderError.couldNotStartWireGuard)
             return
@@ -76,8 +76,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
         let networkSettings: NEPacketTunnelNetworkSettings = packetTunnelSettingsGenerator!.generateNetworkSettings()
         setTunnelNetworkSettings(networkSettings) { error in
             if let error = error {
-                wg_log(.error, staticMessage: "Starting tunnel failed: Error setting network settings.")
-                wg_log(.error, message: "Error from setTunnelNetworkSettings: \(error.localizedDescription)")
+                wg_log(.error, message: "Starting tunnel failed with setTunnelNetworkSettings returning \(error.localizedDescription)")
                 errorNotifier.notify(PacketTunnelProviderError.coultNotSetNetworkSettings)
                 startTunnelCompletionHandler(PacketTunnelProviderError.coultNotSetNetworkSettings)
             } else {