starred/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-09-28 01:46:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Write log/error output from commands to stderr. (#1632)

Browse Source 
- Closes #1631.
- The standard output should only contain result data,
  so that scripts consuming stdout don't need to scrape.
This commit is contained in:
J Logan
2026-06-03 16:17:59 -07:00
committed by GitHub
parent 94d6d0ac36
commit 89fa98c55a
16 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/ContainerCommands/Builder/BuilderStatus.swift
+1 -1
View File
@@ -59,7 +59,7 @@ extension Application {
} catch {
if let czError = error as? ContainerizationError, czError.code == .notFound {
if !quiet {
print("builder is not running")
log.warning("builder is not running")
return
}
}
Sources/ContainerCommands/Builder/BuilderStop.swift
+1 -1
View File
@@ -40,7 +40,7 @@ extension Application {
} catch {
if error is ContainerizationError {
if (error as? ContainerizationError)?.code == .notFound {
print("builder is not running")
log.warning("builder is not running")
return
}
}
Sources/ContainerCommands/Container/ContainerExec.swift
+2 -1
View File
@@ -96,8 +96,9 @@ extension Application {
if !self.processFlags.tty {
var handler = SignalThreshold(threshold: 3, signals: [SIGINT, SIGTERM])
let log = self.log
handler.start {
print("Received 3 SIGINT/SIGTERM's, forcefully exiting.")
log.warning("Received 3 SIGINT/SIGTERM's, forcefully exiting.")
Darwin.exit(1)
}
}
Sources/ContainerCommands/Container/ContainerPrune.swift
+1 -1
View File
@@ -60,7 +60,7 @@ extension Application {
for name in prunedContainerIds {
print(name)
}
print("Reclaimed \(freed) in disk space")
log.info("Reclaimed \(freed) in disk space")
}
}
}
Sources/ContainerCommands/Container/ContainerRun.swift
+2 -1
View File
@@ -160,8 +160,9 @@ extension Application {
if !self.processFlags.tty {
var handler = SignalThreshold(threshold: 3, signals: [SIGINT, SIGTERM])
let log = self.log
handler.start {
print("Received 3 SIGINT/SIGTERM's, forcefully exiting.")
log.warning("Received 3 SIGINT/SIGTERM's, forcefully exiting.")
Darwin.exit(1)
}
}
Sources/ContainerCommands/Image/ImageDelete.swift
+1 -1
View File
@@ -82,7 +82,7 @@ extension Application {
let freed = formatter.string(fromByteCount: Int64(size))
if didDeleteAnyImage {
print("Reclaimed \(freed) in disk space")
log.info("Reclaimed \(freed) in disk space")
}
if failures.count > 0 {
throw ContainerizationError(.internalError, message: "failed to delete one or more images: \(failures)")
Sources/ContainerCommands/Image/ImageLoad.swift
-1
View File
@@ -108,7 +108,6 @@ extension Application {
}
await taskManager.finish()
progress.finish()
print("Loaded images:")
for image in result.images {
print(image.reference)
}
Sources/ContainerCommands/Image/ImagePrune.swift
+1 -1
View File
@@ -82,7 +82,7 @@ extension Application {
let formatter = ByteCountFormatter()
formatter.countStyle = .file
let freed = formatter.string(fromByteCount: Int64(size))
print("Reclaimed \(freed) in disk space")
log.info("Reclaimed \(freed) in disk space")
}
private func hasTag(_ reference: String) -> Bool {
Sources/ContainerCommands/Image/ImageSave.swift
+1 -1
View File
@@ -84,7 +84,7 @@ extension Application {
do {
images.append(try await ClientImage.get(reference: reference, containerSystemConfig: containerSystemConfig).description)
} catch {
print("failed to get image for reference \(reference): \(error)")
log.error("failed to get image for reference \(reference): \(error)")
}
}
Sources/ContainerCommands/Registry/RegistryLogin.swift
+1 -1
View File
@@ -94,7 +94,7 @@ extension Application {
)
try await client.ping()
try keychain.save(hostname: server, username: username, password: password)
print("Login succeeded")
log.info("Login succeeded")
}
}
}
Sources/ContainerCommands/System/Kernel/KernelSet.swift
+1 -1
View File
@@ -57,7 +57,7 @@ extension Application {
if recommended {
let url = containerSystemConfig.kernel.url
let path: String = containerSystemConfig.kernel.binaryPath
print("Installing the recommended kernel from \(url)...")
log.info("Installing the recommended kernel from \(url)...")
try await Self.downloadAndInstallWithProgressBar(tarRemoteURL: url, kernelFilePath: path, force: force)
return
}
Sources/ContainerCommands/System/SystemStart.swift
+5 -5
View File
@@ -125,12 +125,12 @@ extension Application {
let data = try plist.encode()
try data.write(to: plistURL)
print("Registering API server with launchd...")
log.info("Launching container-apiserver...")
try ServiceManager.register(plistPath: plistURL.path)
// Now ping our friendly daemon. Fail if we don't get a response.
do {
print("Verifying apiserver is running...")
log.info("Testing access to container-apiserver...")
_ = try await ClientHealthCheck.ping(timeout: timeout)
} catch {
throw ContainerizationError(
@@ -152,7 +152,7 @@ extension Application {
private func installInitialFilesystem(initImage: String) async throws {
var pullCommand = try ImagePull.parse()
pullCommand.reference = initImage
print("Installing base container filesystem...")
log.info("Installing base container filesystem...")
do {
try await pullCommand.run()
} catch {
@@ -169,7 +169,7 @@ extension Application {
throw ContainerizationError(.internalError, message: "failed to read user input")
}
guard read.lowercased() == "y" || read.count == 0 else {
print("Please use the `container system kernel set --recommended` command to configure the default kernel")
log.info("Please use the `container system kernel set --recommended` command to configure the default kernel")
return
}
shouldInstallKernel = true
@@ -179,7 +179,7 @@ extension Application {
guard shouldInstallKernel else {
return
}
print("Installing kernel...")
log.info("Installing kernel...")
try await KernelSet.downloadAndInstallWithProgressBar(tarRemoteURL: kernelURL, kernelFilePath: kernelBinaryPath, force: true)
}
Sources/ContainerCommands/Volume/VolumePrune.swift
+1 -1
View File
@@ -72,7 +72,7 @@ extension Application.VolumeCommand {
let formatter = ByteCountFormatter()
let freed = formatter.string(fromByteCount: Int64(totalSize))
print("Reclaimed \(freed) in disk space")
log.info("Reclaimed \(freed) in disk space")
}
}
}