mirror of
https://github.com/apple/container.git
synced 2026-07-15 22:17:01 +00:00
356c8d2f88
- Closes #461. - Extract core types into ContainerResources target. - Extract ContainerNetworkServiceClient from ContainerNetworkService. - Relocate sandbox client from ContainerClient to ContainerSandboxServiceClient. - Relocate ContainerClient to ContainerAPIServiceClient. - Common structure from services and clients under Source/Services. Updated project hierarchy: ``` Sources/CAuditToken - audit token access wrapper Sources/CLI - CLI executable Sources/ContainerBuild - builder Sources/ContainerCommands - CLI command implementations Sources/ContainerLog - logging helpers Sources/ContainerPersistence - persistent data and system property helpers Sources/ContainerPlugin - plugin system Sources/ContainerResource - resource (container, image, volume, network) types Sources/ContainerVersion - version helpers Sources/ContainerXPC - XPC helpers Sources/CVersion - injected project version Sources/DNSServer - container DNS resolver Sources/Helpers - service executables Sources/Services/*/Client - service clients Sources/Services/*/Server - service implementations Sources/SocketForwarder - port forwarding Sources/TerminalProgress - progress bar ``` ## Type of Change - [ ] Bug fix - [ ] New feature - [x] Breaking change - [ ] Documentation update ## Motivation and Context The ContainerClient library was a bit of a grab bag. This refactor applies a more sensible project and library structure for resource data types, services, and clients. ## Testing - [x] Tested locally - [x] Added/updated tests - [ ] Added/updated docs
150 lines
5.3 KiB
Swift
150 lines
5.3 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2025-2026 Apple Inc. and the container project authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
import ArgumentParser
|
|
import ContainerAPIClient
|
|
import ContainerizationError
|
|
import Darwin
|
|
import Dispatch
|
|
import Foundation
|
|
|
|
extension Application {
|
|
public struct ContainerLogs: AsyncParsableCommand {
|
|
public init() {}
|
|
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "logs",
|
|
abstract: "Fetch container logs"
|
|
)
|
|
|
|
@Flag(name: .long, help: "Display the boot log for the container instead of stdio")
|
|
var boot: Bool = false
|
|
|
|
@Flag(name: .shortAndLong, help: "Follow log output")
|
|
var follow: Bool = false
|
|
|
|
@Option(name: .short, help: "Number of lines to show from the end of the logs. If not provided this will print all of the logs")
|
|
var numLines: Int?
|
|
|
|
@OptionGroup
|
|
var global: Flags.Global
|
|
|
|
@Argument(help: "Container ID")
|
|
var containerId: String
|
|
|
|
public func run() async throws {
|
|
do {
|
|
let container = try await ClientContainer.get(id: containerId)
|
|
let fhs = try await container.logs()
|
|
let fileHandle = boot ? fhs[1] : fhs[0]
|
|
|
|
try await Self.tail(
|
|
fh: fileHandle,
|
|
n: numLines,
|
|
follow: follow
|
|
)
|
|
} catch {
|
|
throw ContainerizationError(
|
|
.invalidArgument,
|
|
message: "failed to fetch container logs for \(containerId): \(error)"
|
|
)
|
|
}
|
|
}
|
|
|
|
private static func tail(
|
|
fh: FileHandle,
|
|
n: Int?,
|
|
follow: Bool
|
|
) async throws {
|
|
if let n {
|
|
var buffer = Data()
|
|
let size = try fh.seekToEnd()
|
|
var offset = size
|
|
var lines: [String] = []
|
|
|
|
while offset > 0, lines.count < n {
|
|
let readSize = min(1024, offset)
|
|
offset -= readSize
|
|
try fh.seek(toOffset: offset)
|
|
|
|
let data = fh.readData(ofLength: Int(readSize))
|
|
buffer.insert(contentsOf: data, at: 0)
|
|
|
|
if let chunk = String(data: buffer, encoding: .utf8) {
|
|
lines = chunk.components(separatedBy: .newlines)
|
|
lines = lines.filter { !$0.isEmpty }
|
|
}
|
|
}
|
|
|
|
lines = Array(lines.suffix(n))
|
|
for line in lines {
|
|
print(line)
|
|
}
|
|
} else {
|
|
// Fast path if all they want is the full file.
|
|
guard let data = try fh.readToEnd() else {
|
|
// Seems you get nil if it's a zero byte read, or you
|
|
// try and read from dev/null.
|
|
return
|
|
}
|
|
guard let str = String(data: data, encoding: .utf8) else {
|
|
throw ContainerizationError(
|
|
.internalError,
|
|
message: "failed to convert container logs to utf8"
|
|
)
|
|
}
|
|
print(str.trimmingCharacters(in: .newlines))
|
|
}
|
|
|
|
fflush(stdout)
|
|
if follow {
|
|
setbuf(stdout, nil)
|
|
try await Self.followFile(fh: fh)
|
|
}
|
|
}
|
|
|
|
private static func followFile(fh: FileHandle) async throws {
|
|
_ = try fh.seekToEnd()
|
|
let stream = AsyncStream<String> { cont in
|
|
fh.readabilityHandler = { handle in
|
|
let data = handle.availableData
|
|
if data.isEmpty {
|
|
// Triggers on container restart - can exit here as well
|
|
do {
|
|
_ = try fh.seekToEnd() // To continue streaming existing truncated log files
|
|
} catch {
|
|
fh.readabilityHandler = nil
|
|
cont.finish()
|
|
return
|
|
}
|
|
}
|
|
if let str = String(data: data, encoding: .utf8), !str.isEmpty {
|
|
var lines = str.components(separatedBy: .newlines)
|
|
lines = lines.filter { !$0.isEmpty }
|
|
for line in lines {
|
|
cont.yield(line)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
for await line in stream {
|
|
print(line)
|
|
}
|
|
}
|
|
}
|
|
}
|