@@ -61,7 +61,7 @@ public actor ServiceGroup: Sendable {
61
61
self . cancellationSignals = configuration. cancellationSignals
62
62
self . logger = configuration. logger
63
63
self . loggingConfiguration = configuration. logging
64
- self . maximumGracefulShutdownDuration = configuration. _maximumCancellationDuration
64
+ self . maximumGracefulShutdownDuration = configuration. _maximumGracefulShutdownDuration
65
65
self . maximumCancellationDuration = configuration. _maximumCancellationDuration
66
66
}
67
67
@@ -100,7 +100,7 @@ public actor ServiceGroup: Sendable {
100
100
self . cancellationSignals = configuration. cancellationSignals
101
101
self . logger = logger
102
102
self . loggingConfiguration = configuration. logging
103
- self . maximumGracefulShutdownDuration = configuration. _maximumCancellationDuration
103
+ self . maximumGracefulShutdownDuration = configuration. _maximumGracefulShutdownDuration
104
104
self . maximumCancellationDuration = configuration. _maximumCancellationDuration
105
105
}
106
106
@@ -497,15 +497,14 @@ public actor ServiceGroup: Sendable {
497
497
498
498
if #available( macOS 13 . 0 , iOS 16 . 0 , watchOS 9 . 0 , tvOS 16 . 0 , * ) , let maximumGracefulShutdownDuration = self . maximumGracefulShutdownDuration {
499
499
group. addTask {
500
- try await Task . sleep ( for: Duration (
500
+ try ? await Task . sleep ( for: Duration (
501
501
secondsComponent: maximumGracefulShutdownDuration. secondsComponent,
502
502
attosecondsComponent: maximumGracefulShutdownDuration. attosecondsComponent
503
503
) )
504
504
return . gracefulShutdownTimedOut
505
505
}
506
506
}
507
507
508
-
509
508
// We are storing the first error of a service that threw here.
510
509
var error : Error ?
511
510
@@ -657,6 +656,9 @@ public actor ServiceGroup: Sendable {
657
656
) {
658
657
guard cancellationTimeoutTask == nil else {
659
658
// We already have a cancellation timeout task running.
659
+ self . logger. debug (
660
+ " Task cancellation timeout task already running. "
661
+ )
660
662
return
661
663
}
662
664
group. cancelAll ( )
0 commit comments