AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #537 from amnezia-vpn/ios-log-3

Browse source 
Disable ioslogger (due memory leak)
This commit is contained in:
pokamest 2024-01-29 11:37:17 -08:00 • committed by GitHub
commit f412ac6260
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
client/platforms/ios/ioslogger.swift
View file

@ -17,41 +17,41 @@ public class Logger {
deinit {} deinit {}
func log(message: String) { func log(message: String) {
let suiteName = "group.org.amnezia.AmneziaVPN" // let suiteName = "group.org.amnezia.AmneziaVPN"
let logKey = "logMessages" // let logKey = "logMessages"
let sharedDefaults = UserDefaults(suiteName: suiteName) // let sharedDefaults = UserDefaults(suiteName: suiteName)
var logs = sharedDefaults?.array(forKey: logKey) as? [String] ?? [] // var logs = sharedDefaults?.array(forKey: logKey) as? [String] ?? []
logs.append(message) // logs.append(message)
sharedDefaults?.set(logs, forKey: logKey) // sharedDefaults?.set(logs, forKey: logKey)
} }
func writeLog(to targetFile: String) -> Bool { private func writeLog(to targetFile: String) -> Bool {
return true; return true;
} }
static func configureGlobal(tagged tag: String, withFilePath filePath: String?) { static func configureGlobal(tagged tag: String, withFilePath filePath: String?) {
if Logger.global != nil { // if Logger.global != nil {
return // return
} // }
//
Logger.global = Logger(tagged: tag) // Logger.global = Logger(tagged: tag)
//
var appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "Unknown version" // var appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "Unknown version"
//
if let appBuild = Bundle.main.infoDictionary?["CFBundleVersion"] as? String { // if let appBuild = Bundle.main.infoDictionary?["CFBundleVersion"] as? String {
appVersion += " (\(appBuild))" // appVersion += " (\(appBuild))"
} // }
//
Logger.global?.log(message: "App version: \(appVersion)") // Logger.global?.log(message: "App version: \(appVersion)")
} }
} }
func wg_log(_ type: OSLogType, staticMessage msg: StaticString) { func wg_log(_ type: OSLogType, staticMessage msg: StaticString) {
os_log(msg, log: OSLog.default, type: type) // os_log(msg, log: OSLog.default, type: type)
Logger.global?.log(message: "\(msg)") // Logger.global?.log(message: "\(msg)")
} }
func wg_log(_ type: OSLogType, message msg: String) { func wg_log(_ type: OSLogType, message msg: String) {
os_log("%{AMNEZIA}s", log: OSLog.default, type: type, msg) // os_log("%{AMNEZIA}s", log: OSLog.default, type: type, msg)
Logger.global?.log(message: msg) // Logger.global?.log(message: msg)
} }