mirror of
https://github.com/apple/container.git
synced 2026-07-13 13:07:06 +00:00
J Logan
3ad0914fd2
- Closes #1206. - Closes #1185. - Closes #507. - Addresses existing log messages for #642. - Nondeterministic CI errors are resulting from very slow launch times for the first runtime helper, which causes ContainersService to be locked for longer than our 20 sec timeout. Bumping the timeout to 60 seconds addresses this case for now. - Since many log messages needed to be changed to troubleshoot the issue, updated all log messages to use structured logging, and implemented consistent entry/exit logging for all service operations. - Added logging for ContainerService lock acquisition to help with finding root cause for the slow service startup. - Plumbed the `--debug` flag on both `container system start` and `container system logs` so that the flag is actually useful. - Updated the `install-init.sh` script so that can install in a custom app root directory.
85 lines
2.9 KiB
Swift
85 lines
2.9 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 ContainerizationOS
|
|
import Foundation
|
|
import OSLog
|
|
|
|
extension Application {
|
|
public struct SystemLogs: AsyncLoggableCommand {
|
|
public static let subsystem = "com.apple.container"
|
|
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "logs",
|
|
abstract: "Fetch system logs for `container` services"
|
|
)
|
|
|
|
@Flag(name: .shortAndLong, help: "Follow log output")
|
|
var follow: Bool = false
|
|
|
|
@Option(
|
|
name: .long,
|
|
help: "Fetch logs starting from the specified time period (minus the current time); supported formats: m, h, d"
|
|
)
|
|
var last: String = "5m"
|
|
|
|
@OptionGroup
|
|
public var logOptions: Flags.Logging
|
|
|
|
public init() {}
|
|
|
|
public func run() async throws {
|
|
let process = Process()
|
|
let sigHandler = AsyncSignalHandler.create(notify: [SIGINT, SIGTERM])
|
|
|
|
Task {
|
|
for await _ in sigHandler.signals {
|
|
process.terminate()
|
|
Darwin.exit(0)
|
|
}
|
|
}
|
|
|
|
do {
|
|
var args = ["log"]
|
|
args.append(self.follow ? "stream" : "show")
|
|
args.append(contentsOf: ["--info", logOptions.debug ? "--debug" : nil].compactMap { $0 })
|
|
if !self.follow {
|
|
args.append(contentsOf: ["--last", last])
|
|
}
|
|
args.append(contentsOf: ["--predicate", "subsystem = 'com.apple.container'"])
|
|
|
|
process.launchPath = "/usr/bin/env"
|
|
process.arguments = args
|
|
|
|
process.standardOutput = FileHandle.standardOutput
|
|
process.standardError = FileHandle.standardError
|
|
|
|
try process.run()
|
|
process.waitUntilExit()
|
|
} catch {
|
|
throw ContainerizationError(
|
|
.invalidArgument,
|
|
message: "failed to system logs: \(error)"
|
|
)
|
|
}
|
|
throw ArgumentParser.ExitCode(process.terminationStatus)
|
|
}
|
|
}
|
|
}
|