From ab6a729993f8a0b28cee971088ada6642e0cd1b4 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Thu, 8 Feb 2024 20:14:41 +0530 Subject: [PATCH] chore(apple): Add logs about accessing firezone-id in disk (#3607) This PR adds some log messages to help debug why the firezone-id might not get written to / read from disk (related to issue #3565). --- swift/apple/FirezoneNetworkExtension/Adapter.swift | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/swift/apple/FirezoneNetworkExtension/Adapter.swift b/swift/apple/FirezoneNetworkExtension/Adapter.swift index 4590e99d6..4d7a56f96 100644 --- a/swift/apple/FirezoneNetworkExtension/Adapter.swift +++ b/swift/apple/FirezoneNetworkExtension/Adapter.swift @@ -265,17 +265,23 @@ extension Adapter { // for upsert and identification in the admin portal. func getOrCreateFirezoneId(from fileURL: URL) -> String { do { - return try String(contentsOf: fileURL, encoding: .utf8) + let storedID = try String(contentsOf: fileURL, encoding: .utf8) + self.logger.log("Adapter.getOrCreateFirezoneId: Returning ID from disk: \(storedID)") + return storedID } catch { + self.logger.log( + "Adapter.getOrCreateFirezoneId: Could not read firezone-id file \(fileURL.path): \(error)" + ) // Handle the error if the file doesn't exist or isn't readable // Recreate the file, save a new UUIDv4, and return it let newUUIDString = UUID().uuidString do { try newUUIDString.write(to: fileURL, atomically: true, encoding: .utf8) + self.logger.log("Adapter.getOrCreateFirezoneId: Written ID to disk: \(newUUIDString)") } catch { self.logger.error( - "Adapter.getOrCreateFirezoneId: Could not save \(fileURL)! Error: \(error)" + "Adapter.getOrCreateFirezoneId: Could not save firezone-id file \(fileURL.path)! Error: \(error)" ) }