Skip to content

Route a Logger through ContainerManager #843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ArnavReddy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Route a Logger through ContainerManager #843

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions Sources/Containerization/ContainerManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import ContainerizationEXT4
import ContainerizationOCI
import ContainerizationOS
import Foundation
import Logging
import ContainerizationExtras
import SystemPackage
import Virtualization
Expand All @@ -31,6 +32,7 @@ public struct ContainerManager: Sendable {
public let imageStore: ImageStore
private let vmm: VirtualMachineManager
private var network: Network?
private let logger: Logger?

private var containerRoot: URL {
self.imageStore.path.appendingPathComponent("containers")
Expand All @@ -45,16 +47,19 @@ public struct ContainerManager: Sendable {
imageStore: ImageStore,
network: Network? = nil,
rosetta: Bool = false,
nestedVirtualization: Bool = false
nestedVirtualization: Bool = false,
logger: Logger? = nil
) throws {
self.imageStore = imageStore
self.network = network
self.logger = logger
try Self.createRootDirectory(path: self.imageStore.path)
self.vmm = VZVirtualMachineManager(
kernel: kernel,
initialFilesystem: initfs,
rosetta: rosetta,
nestedVirtualization: nestedVirtualization
nestedVirtualization: nestedVirtualization,
logger: logger
)
}

Expand All @@ -67,20 +72,23 @@ public struct ContainerManager: Sendable {
root: URL? = nil,
network: Network? = nil,
rosetta: Bool = false,
nestedVirtualization: Bool = false
nestedVirtualization: Bool = false,
logger: Logger? = nil
) throws {
if let root {
self.imageStore = try ImageStore(path: root)
} else {
self.imageStore = ImageStore.default
}
self.network = network
self.logger = logger
try Self.createRootDirectory(path: self.imageStore.path)
self.vmm = VZVirtualMachineManager(
kernel: kernel,
initialFilesystem: initfs,
rosetta: rosetta,
nestedVirtualization: nestedVirtualization
nestedVirtualization: nestedVirtualization,
logger: logger
)
}

Expand All @@ -93,10 +101,12 @@ public struct ContainerManager: Sendable {
imageStore: ImageStore,
network: Network? = nil,
rosetta: Bool = false,
nestedVirtualization: Bool = false
nestedVirtualization: Bool = false,
logger: Logger? = nil
) async throws {
self.imageStore = imageStore
self.network = network
self.logger = logger
try Self.createRootDirectory(path: self.imageStore.path)

let initPath = self.imageStore.path.appendingPathComponent("initfs.ext4")
Expand All @@ -121,7 +131,8 @@ public struct ContainerManager: Sendable {
kernel: kernel,
initialFilesystem: initfs,
rosetta: rosetta,
nestedVirtualization: nestedVirtualization
nestedVirtualization: nestedVirtualization,
logger: logger
)
}

Expand All @@ -133,14 +144,16 @@ public struct ContainerManager: Sendable {
root: URL? = nil,
network: Network? = nil,
rosetta: Bool = false,
nestedVirtualization: Bool = false
nestedVirtualization: Bool = false,
logger: Logger? = nil
) async throws {
if let root {
self.imageStore = try ImageStore(path: root)
} else {
self.imageStore = ImageStore.default
}
self.network = network
self.logger = logger
try Self.createRootDirectory(path: self.imageStore.path)

let initPath = self.imageStore.path.appendingPathComponent("initfs.ext4")
Expand All @@ -165,19 +178,22 @@ public struct ContainerManager: Sendable {
kernel: kernel,
initialFilesystem: initfs,
rosetta: rosetta,
nestedVirtualization: nestedVirtualization
nestedVirtualization: nestedVirtualization,
logger: logger
)
}

/// Create a new manager with the provided vmm and network.
public init(
vmm: any VirtualMachineManager,
network: Network? = nil
network: Network? = nil,
logger: Logger? = nil
) throws {
self.imageStore = ImageStore.default
try Self.createRootDirectory(path: self.imageStore.path)
self.network = network
self.vmm = vmm
self.logger = logger
}

private static func createRootDirectory(path: URL) throws {
Expand Down Expand Up @@ -297,7 +313,8 @@ public struct ContainerManager: Sendable {
id,
rootfs: rootfs,
writableLayer: writableLayer,
vmm: self.vmm
vmm: self.vmm,
logger: self.logger
) { config in
if let imageConfig {
config.process = .init(from: imageConfig)
Expand Down