passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save debug log to file in app group container 

Don't bog UserDefaults. Reuse debugLogKey for the log filename.
This commit is contained in:
Davide De Rosa 2018-10-24 19:21:44 +02:00
parent 8b78a64dbd
commit f5d12300f9
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TunnelKit/Sources/AppExtension/MemoryDestination.swift
View File

@ -54,11 +54,11 @@ class MemoryDestination: BaseDestination, CustomStringConvertible {
} }
} }
func flush(to: UserDefaults, with key: String) { func flush(to url: URL) {
execute(synchronously: true) { execute(synchronously: true) {
to.set(self.buffer, forKey: key) let content = self.buffer.joined(separator: "\n")
try? content.write(to: url, atomically: true, encoding: .utf8)
} }
to.synchronize()
} }
var description: String { var description: String {

18
TunnelKit/Sources/AppExtension/TunnelKitProvider+Configuration.swift
View File

@ -159,7 +159,7 @@ extension TunnelKitProvider {
/// Enables debugging. If `true`, then `debugLogKey` is a mandatory field. /// Enables debugging. If `true`, then `debugLogKey` is a mandatory field.
public var shouldDebug: Bool public var shouldDebug: Bool
/// The key in `defaults` where the latest debug log snapshot is stored. Ignored if `shouldDebug` is `false`. /// The filename in group container where the latest debug log snapshot is stored. Ignored if `shouldDebug` is `false`.
public var debugLogKey: String? public var debugLogKey: String?
/// Optional debug log format (SwiftyBeaver format). /// Optional debug log format (SwiftyBeaver format).
@ -403,12 +403,22 @@ extension TunnelKitProvider {
public let lastErrorKey: String? public let lastErrorKey: String?
// MARK: Shortcuts // MARK: Shortcuts
func existingLog(in defaults: UserDefaults) -> [String]? { func urlForLog(in appGroup: String) -> URL? {
guard shouldDebug, let key = debugLogKey else { guard shouldDebug, let key = debugLogKey else {
return nil return nil
} }
return defaults.array(forKey: key) as? [String] guard let parentURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroup) else {
return nil
}
return parentURL.appendingPathComponent("\(key).log")
}
func existingLog(in appGroup: String) -> String? {
guard let url = urlForLog(in: appGroup) else {
return nil
}
return try? String(contentsOf: url)
} }
// MARK: API // MARK: API

11
TunnelKit/Sources/AppExtension/TunnelKitProvider.swift
View File

@ -94,12 +94,12 @@ open class TunnelKitProvider: NEPacketTunnelProvider {
private var appGroup: String! private var appGroup: String!
private lazy var defaults = UserDefaults(suiteName: appGroup)
private var cfg: Configuration! private var cfg: Configuration!
private var strategy: ConnectionStrategy! private var strategy: ConnectionStrategy!
private lazy var defaults = UserDefaults(suiteName: appGroup)
// MARK: Internal state // MARK: Internal state
private var proxy: SessionProxy? private var proxy: SessionProxy?
@ -157,7 +157,8 @@ open class TunnelKitProvider: NEPacketTunnelProvider {
strategy = ConnectionStrategy(hostname: hostname, configuration: cfg) strategy = ConnectionStrategy(hostname: hostname, configuration: cfg)
if let defaults = defaults, var existingLog = cfg.existingLog(in: defaults) { if let content = cfg.existingLog(in: appGroup) {
var existingLog = content.components(separatedBy: "\n")
if let i = existingLog.index(of: logSeparator) { if let i = existingLog.index(of: logSeparator) {
existingLog.removeFirst(i + 2) existingLog.removeFirst(i + 2)
} }
@ -595,8 +596,8 @@ extension TunnelKitProvider {
private func flushLog() { private func flushLog() {
log.debug("Flushing log...") log.debug("Flushing log...")
if let defaults = defaults, let key = cfg.debugLogKey { if let url = cfg.urlForLog(in: appGroup) {
memoryLog.flush(to: defaults, with: key) memoryLog.flush(to: url)
} }
} }