diff options
Diffstat (limited to '')
| -rw-r--r-- | WireGuard/WireGuard/UI/iOS/AppDelegate.swift | 12 | ||||
| -rw-r--r-- | WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift | 6 |
2 files changed, 4 insertions, 14 deletions
diff --git a/WireGuard/WireGuard/UI/iOS/AppDelegate.swift b/WireGuard/WireGuard/UI/iOS/AppDelegate.swift index a5856e0..32c1286 100644 --- a/WireGuard/WireGuard/UI/iOS/AppDelegate.swift +++ b/WireGuard/WireGuard/UI/iOS/AppDelegate.swift @@ -12,17 +12,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - - if let appLogFilePath = FileManager.appLogFileURL?.path { - if !Logger.configure(withFilePath: appLogFilePath) { - os_log("Can't open log file for writing. Log is not saved to file.", log: OSLog.default, type: .error) - } - } else { - os_log("Can't obtain log file URL. Log is not saved to file.", log: OSLog.default, type: .error) - } - - wg_log(.info, message: "Launching app") - wg_log_versions_to_file() + Logger.configureGlobal(withFilePath: FileManager.appLogFileURL?.path, withTag: "APP") let window = UIWindow(frame: UIScreen.main.bounds) window.backgroundColor = UIColor.white diff --git a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift index 2d17224..af9893d 100644 --- a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift @@ -115,13 +115,13 @@ class SettingsTableViewController: UITableViewController { } guard let networkExtensionLogFilePath = FileManager.networkExtensionLogFileURL?.path else { - ErrorPresenter.showErrorAlert(title: "Log export failed", message: "Internal error obtaining extension log path", from: self) + ErrorPresenter.showErrorAlert(title: "Log export failed", message: "Unable to determine extension log path", from: self) return } - let isWritten = Logger.writeLog(mergedWith: networkExtensionLogFilePath, tag: "APP", otherTag: "EXT", to: destinationURL.path) + let isWritten = Logger.global?.writeLog(mergedWith: networkExtensionLogFilePath, to: destinationURL.path) ?? false guard isWritten else { - ErrorPresenter.showErrorAlert(title: "Log export failed", message: "Internal error merging logs", from: self) + ErrorPresenter.showErrorAlert(title: "Log export failed", message: "Unable to write logs to file", from: self) return } |