Skip to content

Commit 06f9c21

Browse files
committed
Fix some smaller issues
1 parent 9eff7ba commit 06f9c21

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

Sources/ServiceLifecycle/ServiceGroup.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public actor ServiceGroup: Sendable {
6161
self.cancellationSignals = configuration.cancellationSignals
6262
self.logger = configuration.logger
6363
self.loggingConfiguration = configuration.logging
64-
self.maximumGracefulShutdownDuration = configuration._maximumCancellationDuration
64+
self.maximumGracefulShutdownDuration = configuration._maximumGracefulShutdownDuration
6565
self.maximumCancellationDuration = configuration._maximumCancellationDuration
6666
}
6767

@@ -100,7 +100,7 @@ public actor ServiceGroup: Sendable {
100100
self.cancellationSignals = configuration.cancellationSignals
101101
self.logger = logger
102102
self.loggingConfiguration = configuration.logging
103-
self.maximumGracefulShutdownDuration = configuration._maximumCancellationDuration
103+
self.maximumGracefulShutdownDuration = configuration._maximumGracefulShutdownDuration
104104
self.maximumCancellationDuration = configuration._maximumCancellationDuration
105105
}
106106

@@ -497,15 +497,14 @@ public actor ServiceGroup: Sendable {
497497

498498
if #available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *), let maximumGracefulShutdownDuration = self.maximumGracefulShutdownDuration {
499499
group.addTask {
500-
try await Task.sleep(for: Duration(
500+
try? await Task.sleep(for: Duration(
501501
secondsComponent: maximumGracefulShutdownDuration.secondsComponent,
502502
attosecondsComponent: maximumGracefulShutdownDuration.attosecondsComponent
503503
))
504504
return .gracefulShutdownTimedOut
505505
}
506506
}
507507

508-
509508
// We are storing the first error of a service that threw here.
510509
var error: Error?
511510

@@ -657,6 +656,9 @@ public actor ServiceGroup: Sendable {
657656
) {
658657
guard cancellationTimeoutTask == nil else {
659658
// We already have a cancellation timeout task running.
659+
self.logger.debug(
660+
"Task cancellation timeout task already running."
661+
)
660662
return
661663
}
662664
group.cancelAll()

Tests/ServiceLifecycleTests/ServiceGroupTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ final class ServiceGroupTests: XCTestCase {
588588
let service3 = MockService(description: "Service3")
589589
let serviceGroup = self.makeServiceGroup(
590590
services: [.init(service: service1), .init(service: service2), .init(service: service3)],
591-
gracefulShutdownSignals: [.sighup],
591+
gracefulShutdownSignals: [.sigwinch],
592592
cancellationSignals: [.sigalrm]
593593
)
594594

@@ -607,7 +607,7 @@ final class ServiceGroupTests: XCTestCase {
607607
await XCTAsyncAssertEqual(await eventIterator3.next(), .run)
608608

609609
let pid = getpid()
610-
kill(pid, UnixSignal.sighup.rawValue)
610+
kill(pid, UnixSignal.sigwinch.rawValue)
611611

612612
await XCTAsyncAssertEqual(await eventIterator3.next(), .shutdownGracefully)
613613

0 commit comments

Comments
 (0)