diff --git a/Sources/XCRemoteCache/Commands/Postbuild/XCPostbuild.swift b/Sources/XCRemoteCache/Commands/Postbuild/XCPostbuild.swift index ab08e4c..388282d 100644 --- a/Sources/XCRemoteCache/Commands/Postbuild/XCPostbuild.swift +++ b/Sources/XCRemoteCache/Commands/Postbuild/XCPostbuild.swift @@ -35,6 +35,7 @@ public class XCPostbuild { do { config = try XCRemoteCacheConfigReader(env: env, fileManager: fileManager).readConfiguration() context = try PostbuildContext(config, env: env) + updateProcessTag(context.targetName) let counterFactory: FileStatsCoordinator.CountersFactory = { file, count in ExclusiveFileCounter(ExclusiveFile(file, mode: .override), countersCount: count) } diff --git a/Sources/XCRemoteCache/Commands/Prebuild/XCPrebuild.swift b/Sources/XCRemoteCache/Commands/Prebuild/XCPrebuild.swift index 7fc43b8..b043796 100644 --- a/Sources/XCRemoteCache/Commands/Prebuild/XCPrebuild.swift +++ b/Sources/XCRemoteCache/Commands/Prebuild/XCPrebuild.swift @@ -31,6 +31,7 @@ public class XCPrebuild { do { config = try XCRemoteCacheConfigReader(env: env, fileManager: fileManager).readConfiguration() context = try PrebuildContext(config, env: env) + updateProcessTag(context.targetName) } catch { // Fatal error: exit(1, "FATAL: Prebuild initialization failed with error: \(error)") diff --git a/Sources/XCRemoteCache/Logger/Logger.swift b/Sources/XCRemoteCache/Logger/Logger.swift index e83c8d1..066ba6e 100644 --- a/Sources/XCRemoteCache/Logger/Logger.swift +++ b/Sources/XCRemoteCache/Logger/Logger.swift @@ -22,34 +22,36 @@ import Foundation import os.log +private var processTag: String = "" + public func exit(_ exitCode: Int32, _ message: String) -> Never { - os_log("%{public}@", log: OSLog.default, type: .error, message) + os_log("%{public}@%{public}@", log: OSLog.default, type: .error, processTag, message) printError(errorMessage: message) exit(exitCode) } func defaultLog(_ message: String) { - os_log("%{public}@", log: OSLog.default, type: .default, message) + os_log("%{public}@%{public}@", log: OSLog.default, type: .default, processTag, message) } func errorLog(_ message: String) { - os_log("%{public}@", log: OSLog.default, type: .error, message) + os_log("%{public}@%{public}@", log: OSLog.default, type: .error, processTag, message) } func infoLog(_ message: String) { - os_log("%{public}@", log: OSLog.default, type: .info, message) + os_log("%{public}@%{public}@", log: OSLog.default, type: .info, processTag, message) } func debugLog(_ message: String) { - os_log("%{public}@", log: OSLog.default, type: .debug, message) + os_log("%{public}@%{public}@", log: OSLog.default, type: .debug, processTag, message) } func printError(errorMessage: String) { - fputs("error: \(errorMessage)\n", stderr) + fputs("error: \(processTag)\(errorMessage)\n", stderr) } func printWarning(_ message: String) { - print("warning: \(message)") + print("warning: \(processTag)\(message)") } /// Prints a message to the user. It shows in Xcode (if applies) or console output @@ -57,3 +59,7 @@ func printWarning(_ message: String) { func printToUser(_ message: String) { print("[RC] \(message)") } + +func updateProcessTag(_ tag: String) { + processTag = "(\(tag)) " +}