Update logging

Ice/Bridging/Bridging.swift

@@ -4,7 +4,6 @@
 //
 
 import Cocoa
-import OSLog
 
 /// A namespace for bridged functionality.
 enum Bridging { }

Ice/ControlItem/ControlItem.swift

@@ -5,7 +5,6 @@
 
 import Cocoa
 import Combine
-import OSLog
 
 /// A status item that controls a section in the menu bar.
 @MainActor

Ice/Events/EventManager.swift

@@ -5,7 +5,6 @@
 
 import Cocoa
 import Combine
-import OSLog
 
 /// Manager for the various event monitors maintained by the app.
 @MainActor

Ice/Hotkeys/Hotkey.swift

@@ -4,7 +4,6 @@
 //
 
 import Combine
-import OSLog
 
 /// A combination of a key and modifiers that can be used to
 /// trigger actions on system-wide key-up or key-down events.
@@ -91,7 +90,7 @@ extension Hotkey {
                 return
             }
             guard let appState else {
-                logError(to: .hotkey, "Error invalidating hotkey: Missing AppState")
+                logError("Error invalidating hotkey: Missing AppState")
                 return
             }
             defer {
@@ -141,8 +140,3 @@ extension Hotkey: Hashable {
         hasher.combine(action)
     }
 }
-
-// MARK: - Logger
-private extension Logger {
-    static let hotkey = Logger(category: "Hotkey")
-}

Ice/Hotkeys/HotkeyRegistry.swift

@@ -6,7 +6,6 @@
 import Carbon.HIToolbox
 import Cocoa
 import Combine
-import OSLog
 
 /// An object that manages the registration, storage, and unregistration of hotkeys.
 final class HotkeyRegistry {

Ice/Hotkeys/KeyCombination.swift

@@ -5,7 +5,6 @@
 
 import Carbon.HIToolbox
 import Cocoa
-import OSLog
 
 struct KeyCombination: Hashable {
     let key: KeyCode
@@ -32,11 +31,11 @@ private func getSystemReservedKeyCombinations() -> [KeyCombination] {
     let status = CopySymbolicHotKeys(&symbolicHotkeys)
 
     guard status == noErr else {
-        logError(to: .keyCombination, "CopySymbolicHotKeys returned invalid status: \(status)")
+        logError("CopySymbolicHotKeys returned invalid status: \(status)")
         return []
     }
     guard let reservedHotkeys = symbolicHotkeys?.takeRetainedValue() as? [[String: Any]] else {
-        logError(to: .keyCombination, "Failed to serialize symbolic hotkeys")
+        logError("Failed to serialize symbolic hotkeys")
         return []
     }
 
@@ -84,8 +83,3 @@ extension KeyCombination: Codable {
         try container.encode(modifiers.rawValue)
     }
 }
-
-// MARK: - Logger
-private extension Logger {
-    static let keyCombination = Logger(category: "KeyCombination")
-}

Ice/Main/AppDelegate.swift

@@ -3,7 +3,6 @@
 //  Ice
 //
 
-import OSLog
 import SwiftUI
 
 @MainActor

Ice/Main/AppState.swift

@@ -4,7 +4,6 @@
 //
 
 import Combine
-import OSLog
 import SwiftUI
 
 /// The model for app-wide state.

Ice/MenuBar/Appearance/MenuBarAppearanceManager.swift

@@ -5,7 +5,6 @@
 
 import Cocoa
 import Combine
-import OSLog
 
 /// A manager for the appearance of the menu bar.
 @MainActor

Ice/MenuBar/Appearance/MenuBarOverlayPanel.swift

@@ -5,7 +5,6 @@
 
 import Cocoa
 import Combine
-import OSLog
 
 // MARK: - Overlay Panel
 

Ice/MenuBar/MenuBarItemImageCache.swift

@@ -5,7 +5,6 @@
 
 import Cocoa
 import Combine
-import OSLog
 
 /// Cache for menu bar item images.
 final class MenuBarItemImageCache: ObservableObject {

Ice/MenuBar/MenuBarItemManager.swift

@@ -5,7 +5,6 @@
 
 import Cocoa
 import Combine
-import OSLog
 
 /// Manager for menu bar items.
 @MainActor

Ice/MenuBar/MenuBarManager.swift

@@ -5,7 +5,6 @@
 
 import AXSwift
 import Combine
-import OSLog
 import SwiftUI
 
 /// Manager for the state of the menu bar.

Ice/MenuBar/MenuBarSection.swift

@@ -4,7 +4,6 @@
 //
 
 import Cocoa
-import OSLog
 
 /// A representation of a section in a menu bar.
 @MainActor

Ice/MenuBar/Spacing/MenuBarItemSpacingManager.swift

@@ -5,7 +5,6 @@
 
 import Cocoa
 import Combine
-import OSLog
 
 /// Manager for menu bar item spacing.
 @MainActor

Ice/Settings/SettingsManagers/GeneralSettingsManager.swift

@@ -5,7 +5,6 @@
 
 import Combine
 import Foundation
-import OSLog
 
 @MainActor
 final class GeneralSettingsManager: ObservableObject {

Ice/Settings/SettingsManagers/HotkeySettingsManager.swift

@@ -4,7 +4,7 @@
 //
 
 import Combine
-import OSLog
+import Foundation
 
 @MainActor
 final class HotkeySettingsManager: ObservableObject {

Ice/UI/IceUI/IceMenu.swift

@@ -4,7 +4,6 @@
 //
 
 import SwiftUI
-import OSLog
 
 struct IceMenu<Title: View, Label: View, Content: View>: View {
     @State private var isHovering = false
@@ -110,7 +109,7 @@ private struct IceMenuLayout<Title: View>: _VariadicView_UnaryViewRoot {
 
 private final class IceMenuItemAction: Hashable {
     static let nullAction = IceMenuItemAction {
-        logWarning(to: .iceMenu, "No action assigned to menu item")
+        logWarning("No action assigned to menu item")
     }
 
     let body: () -> Void
@@ -161,8 +160,3 @@ extension View {
         preference(key: IceMenuItemActionKey.self, value: IceMenuItemAction(body: action))
     }
 }
-
-// MARK: - Logger
-private extension Logger {
-    static let iceMenu = Logger(category: "IceMenu")
-}

Ice/UI/LayoutBar/LayoutBarPaddingView.swift

@@ -5,7 +5,6 @@
 
 import Cocoa
 import Combine
-import OSLog
 
 /// A Cocoa view that manages the menu bar layout interface.
 final class LayoutBarPaddingView: NSView {

Ice/Utilities/EventMonitors/EventTap.swift

@@ -4,7 +4,6 @@
 //
 
 import Cocoa
-import OSLog
 
 /// A type that receives system events from various locations within the
 /// event stream.

Ice/Utilities/Logging.swift

@@ -5,34 +5,42 @@
 
 import OSLog
 
+/// A type that encapsulates logging behavior for Ice.
+struct Logger {
+    fileprivate let base: os.Logger
+
+    /// Creates a logger for Ice using the specified category.
+    init(category: String) {
+        self.base = os.Logger(subsystem: Constants.bundleIdentifier, category: category)
+    }
+}
+
+extension Logger {
+    /// The default logger.
+    static let `default` = Logger(category: "Default")
+}
+
 /// Logs the given message using the specified logger and level.
-func logMessage(to logger: Logger, at level: OSLogType, _ message: String) {
-    logger.log(level: level, "\(message, privacy: .public)")
+func logMessage(to logger: Logger = .default, level: OSLogType, _ message: String) {
+    logger.base.log(level: level, "\(message, privacy: .public)")
 }
 
 /// Logs the given informative message using the specified logger.
-func logInfo(to logger: Logger, _ message: String) {
-    logMessage(to: logger, at: .info, message)
+func logInfo(to logger: Logger = .default, _ message: String) {
+    logMessage(to: logger, level: .info, message)
 }
 
 /// Logs the given debug message using the specified logger.
-func logDebug(to logger: Logger, _ message: String) {
-    logMessage(to: logger, at: .debug, message)
+func logDebug(to logger: Logger = .default, _ message: String) {
+    logMessage(to: logger, level: .debug, message)
 }
 
 /// Logs the given error message using the specified logger.
-func logError(to logger: Logger, _ message: String) {
-    logMessage(to: logger, at: .error, message)
+func logError(to logger: Logger = .default, _ message: String) {
+    logMessage(to: logger, level: .error, message)
 }
 
 /// Logs the given warning message using the specified logger.
-func logWarning(to logger: Logger, _ message: String) {
+func logWarning(to logger: Logger = .default, _ message: String) {
     logError(to: logger, message)
 }
-
-extension Logger {
-    /// Creates a logger for Ice using the specified category.
-    init(category: String) {
-        self.init(subsystem: Constants.bundleIdentifier, category: category)
-    }
-}

Ice/Utilities/MigrationManager.swift

@@ -4,7 +4,6 @@
 //
 
 import Cocoa
-import OSLog
 
 @MainActor
 struct MigrationManager {

Ice/Utilities/MouseCursor.swift

@@ -4,23 +4,22 @@
 //
 
 import CoreGraphics
-import OSLog
 
 /// A namespace for mouse cursor operations.
 enum MouseCursor {
     /// Hides the mouse cursor and increments the hide cursor count.
     static func hide() {
         let result = CGDisplayHideCursor(CGMainDisplayID())
         if result != .success {
-            logError(to: .mouseCursor, "CGDisplayHideCursor failed with error \(result.logString)")
+            logError("CGDisplayHideCursor failed with error \(result.logString)")
         }
     }
 
     /// Decrements the hide cursor count and shows the mouse cursor if the count is `0`.
     static func show() {
         let result = CGDisplayShowCursor(CGMainDisplayID())
         if result != .success {
-            logError(to: .mouseCursor, "CGDisplayShowCursor failed with error \(result.logString)")
+            logError("CGDisplayShowCursor failed with error \(result.logString)")
         }
     }
 
@@ -30,7 +29,7 @@ enum MouseCursor {
     static func warp(to point: CGPoint) {
         let result = CGWarpMouseCursorPosition(point)
         if result != .success {
-            logError(to: .mouseCursor, "CGWarpMouseCursorPosition failed with error \(result.logString)")
+            logError("CGWarpMouseCursorPosition failed with error \(result.logString)")
         }
     }
 
@@ -52,8 +51,3 @@ enum MouseCursor {
         }
     }
 }
-
-// MARK: - Logger
-private extension Logger {
-    static let mouseCursor = Logger(category: "MouseCursor")
-}