Logging cleanup

Signed-off-by: Dan Cunningham <[email protected]>
openhab · Sep 14, 2024 · e7a35b8 · e7a35b8
1 parent 76654e9
commit e7a35b8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/OpenHABCore/Sources/OpenHABCore/Util/NetworkTracker.swift b/OpenHABCore/Sources/OpenHABCore/Util/NetworkTracker.swift
@@ -12,6 +12,7 @@
 import Alamofire
 import Foundation
 import Network
+import os.log
 
 // TODO: these strings should reference Localizable keys
 public enum NetworkStatus: String {
@@ -48,10 +49,10 @@ public final class NetworkTracker: ObservableObject {
         monitor = NWPathMonitor()
         monitor.pathUpdateHandler = { [weak self] path in
             if path.status == .satisfied {
-                print("Network status: Connected")
+                os_log("Network status: Connected", log: OSLog.default, type: .info)
                 self?.attemptConnection()
             } else {
-                print("Network status: Disconnected")
+                os_log("Network status: Disconnected", log: OSLog.default, type: .info)
                 self?.updateStatus(.notConnected)
             }
         }
@@ -73,18 +74,18 @@ public final class NetworkTracker: ObservableObject {
         NetworkConnection.tracker(openHABRootUrl: activeServer.url) { [weak self] response in
             switch response.result {
             case .success:
-                print("Network status: Active server is reachable: \(activeServer.url)")
+                os_log("Network status: Active server is reachable: %{PUBLIC}@", log: OSLog.default, type: .info, activeServer.url)
                 self?.updateStatus(.connected) // If reachable, we're done
             case .failure:
-                print("Network status: Active server is not reachable: \(activeServer.url)")
+                os_log("Network status: Active server is not reachable: %{PUBLIC}@", log: OSLog.default, type: .error, activeServer.url)
                 self?.attemptConnection() // If not reachable, run the connection logic
             }
         }
     }
 
     private func attemptConnection() {
         guard !connectionObjects.isEmpty else {
-            print("Network status: No connection objects available.")
+            os_log("Network status: No connection objects available.", log: OSLog.default, type: .error)
             updateStatus(.notConnected)
             return
         }
@@ -121,11 +122,11 @@ public final class NetworkTracker: ObservableObject {
                         }
                         dispatchGroup.leave()
                     } else {
-                        print("Network status: Failed version when connecting to: \(connection.url)")
+                        os_log("Network status: Failed version when connecting to: %{PUBLIC}@", log: OSLog.default, type: .error, connection.url)
                         dispatchGroup.leave()
                     }
                 case let .failure(error):
-                    print("Network status: Failed connection to: \(connection.url) : \(error.localizedDescription)")
+                    os_log("Network status: Failed connection to: %{PUBLIC}@ : %{PUBLIC}@", log: OSLog.default, type: .error, connection.url, error.localizedDescription)
                     dispatchGroup.leave()
                 }
             }
@@ -144,18 +145,18 @@ public final class NetworkTracker: ObservableObject {
 
         dispatchGroup.notify(queue: .main) {
             if let highestPriorityConnection {
-                print("Network status: Highest priority connection established: \(highestPriorityConnection.url)")
+                os_log("Network status: Highest priority connection established: %{PUBLIC}@", log: OSLog.default, type: .info, highestPriorityConnection.url)
             } else if let nonPriorityConnection {
-                print("Network status: Non-priority connection established: \(nonPriorityConnection.url)")
+                os_log("Network status: Non-priority connection established: %{PUBLIC}@", log: OSLog.default, type: .info, nonPriorityConnection.url)
             } else {
-                print("Network status: No server responded.")
+                os_log("Network status: No server responded.", log: OSLog.default, type: .error)
                 self.updateStatus(.connectionFailed)
             }
         }
     }
 
     private func setActiveServer(_ server: ConnectionObject) {
-        print("Network status: setActiveServer: \(server.url)")
+        os_log("Network status: setActiveServer: %{PUBLIC}@", log: OSLog.default, type: .info, server.url)
 
         if activeServer != server {
             activeServer = server
@@ -172,7 +173,7 @@ public final class NetworkTracker: ObservableObject {
     private func getServerInfoFromData(data: Data) -> Int {
         do {
             let serverProperties = try data.decoded(as: OpenHABServerProperties.self)
-            // OH versions 2.0 through 2.4 return "1" as thier version, so set the floor to 2 so we do not think this is a OH 1.x serevr
+            // OH versions 2.0 through 2.4 return "1" as their version, so set the floor to 2 so we do not think this is an OH 1.x server
             return max(2, Int(serverProperties.version) ?? 2)
         } catch {
             return -1

diff --git a/OpenHABCore/Sources/OpenHABCore/Util/Preferences.swift b/OpenHABCore/Sources/OpenHABCore/Util/Preferences.swift
@@ -58,18 +58,15 @@ public struct UserDefaultURL {
             return trimmedUri.isValidURL ? trimmedUri : defaultValue
         }
         set {
-            print("Setting Preferences")
             Preferences.sharedDefaults.set(newValue, forKey: key)
             let subject = subject
             let defaultValue = defaultValue
             // Trim and validate the new URL
             let trimmedUri = uriWithoutTrailingSlashes(newValue).trimmingCharacters(in: .whitespacesAndNewlines)
             DispatchQueue.main.async {
                 if trimmedUri.isValidURL {
-                    print("Sending trimedUri change \(trimmedUri)")
                     subject.send(trimmedUri)
                 } else {
-                    print("Sendingdefault URL change \(trimmedUri)")
                     subject.send(defaultValue)
                 }
             }

diff --git a/openHAB/OpenHABRootViewController.swift b/openHAB/OpenHABRootViewController.swift
@@ -125,7 +125,6 @@ class OpenHABRootViewController: UIViewController {
             Preferences.$remoteUrl
         )
         .sink { (localUrl, remoteUrl) in
-            print("Local URL: \(localUrl), Remote URL: \(remoteUrl)")
             let connection1 = ConnectionObject(
                 url: localUrl,
                 priority: 0