passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set full log path relative to App Group container 

Also rename from Debug.log to App.log
This commit is contained in:
Davide De Rosa 2022-06-04 09:25:15 +02:00
parent 10b4c321c8
commit bb1a35acea
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Passepartout/App/Constants/Constants+Extensions.swift
View File

@ -149,6 +149,16 @@ extension Constants {
} }
enum Log { enum Log {
private static let parentPath = "Library/Caches"
private static func containerLogURL(filename: String) -> URL {
Files.containerURL
.appendingPathComponent(parentPath)
.appendingPathComponent(filename)
}
static let appLogURL = containerLogURL(filename: "App.log")
static let logLevel: SwiftyBeaver.Level = { static let logLevel: SwiftyBeaver.Level = {
guard let levelString = ProcessInfo.processInfo.environment["LOG_LEVEL"], let levelNum = Int(levelString) else { guard let levelString = ProcessInfo.processInfo.environment["LOG_LEVEL"], let levelNum = Int(levelString) else {
return .info return .info
@ -158,12 +168,6 @@ extension Constants {
static let logFormat = "$DHH:mm:ss.SSS$d $C$L$c $N.$F:$l - $M" static let logFormat = "$DHH:mm:ss.SSS$d $C$L$c $N.$F:$l - $M"
private static let appFileName = "Debug.log"
static var appFileURL: URL {
return Files.cachesURL.appendingPathComponent(appFileName)
}
static let tunnelLogFormat = "$DHH:mm:ss$d - $M" static let tunnelLogFormat = "$DHH:mm:ss$d - $M"
static let tunnelLogMaxBytes = 15000 static let tunnelLogMaxBytes = 15000
@ -256,18 +260,12 @@ extension Constants {
extension Constants { extension Constants {
enum Files { enum Files {
private static var containerURL: URL { fileprivate static var containerURL: URL {
guard let url = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: App.appGroupId) else { guard let url = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: App.appGroupId) else {
print("Unable to access App Group container") print("Unable to access App Group container")
return FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0] return FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0]
} }
return url return url
} }
static let cachesURL: URL = {
let url = containerURL.appendingPathComponent("Library/Caches", isDirectory: true)
try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true, attributes: nil)
return url
}()
} }
} }

2
Passepartout/App/Contexts/AppContext.swift
View File

@ -40,7 +40,7 @@ class AppContext {
private var cancellables: Set<AnyCancellable> = [] private var cancellables: Set<AnyCancellable> = []
init(coreContext: CoreContext) { init(coreContext: CoreContext) {
logManager = LogManager(logFile: Constants.Log.appFileURL) logManager = LogManager(logFile: Constants.Log.appLogURL)
logManager.logLevel = Constants.Log.logLevel logManager.logLevel = Constants.Log.logLevel
logManager.logFormat = Constants.Log.logFormat logManager.logFormat = Constants.Log.logFormat
logManager.configureLogging() logManager.configureLogging()