From bcf8537400674bf5770d982dc755c8b0ee549692 Mon Sep 17 00:00:00 2001 From: Bart Reardon Date: Tue, 5 Sep 2023 22:39:46 +1000 Subject: [PATCH] moved some log variables around --- Outset/Outset.swift | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Outset/Outset.swift b/Outset/Outset.swift index b91f484..3f2138b 100644 --- a/Outset/Outset.swift +++ b/Outset/Outset.swift @@ -25,9 +25,6 @@ let loginEveryPrivilegedDir = outsetDirectory+"login-privileged-every" let loginOncePrivilegedDir = outsetDirectory+"login-privileged-once" let onDemandDir = outsetDirectory+"on-demand" let shareDirectory = outsetDirectory+"share/" -let logDirectory = outsetDirectory+"logs" -let logFileName = "outset.log" -let logFilePath = logDirectory+"/"+logFileName let onDemandTrigger = "/private/tmp/.io.macadmins.outset.ondemand.launchd" let loginPrivilegedTrigger = "/private/tmp/.io.macadmins.outset.login-privileged.launchd" @@ -47,7 +44,11 @@ var prefs = loadOutsetPreferences() // Log Stuff let bundleID = Bundle.main.bundleIdentifier ?? "io.macadmins.Outset" let osLog = OSLog(subsystem: bundleID, category: "main") -let logRotateDays: Int = 30 +// We could make these availab as preferences perhaps +let logFileName = "outset.log" +let logFileMaxCount: Int = 30 +let logDirectory = outsetDirectory+"logs" +let logFilePath = logDirectory+"/"+logFileName // Logic insertion point @main @@ -158,7 +159,7 @@ struct Outset: ParsableCommand { if boot { // perform log file rotation - performLogRotation(logFolderPath: logDirectory, logFileBaseName: logFileName) + performLogRotation(logFolderPath: logDirectory, logFileBaseName: logFileName, maxLogFiles: logFileMaxCount) writeLog("Processing scheduled runs for boot", logLevel: .debug) ensureWorkingFolders()