Shut down the driver's connection pool safely (#224)

* Update required versions of dependencies * Shut down the EventLoopGroupConnectionPool using an API that doesn't call EventLoopFuture.wait() internally.
vapor · May 24, 2024 · 4f07d7f · 4f07d7f
1 parent 26f142d
commit 4f07d7f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/Package.swift b/Package.swift
@@ -13,8 +13,8 @@ let package = Package(
         .library(name: "FluentMySQLDriver", targets: ["FluentMySQLDriver"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.48.1"),
-        .package(url: "https://github.com/vapor/mysql-kit.git", from: "4.7.1"),
+        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.48.4"),
+        .package(url: "https://github.com/vapor/mysql-kit.git", from: "4.8.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
     ],
     targets: [
@@ -42,6 +42,4 @@ let package = Package(
 var swiftSettings: [SwiftSetting] { [
     .enableUpcomingFeature("ConciseMagicFile"),
     .enableUpcomingFeature("ForwardTrailingClosures"),
-    .enableUpcomingFeature("DisableOutwardActorInference"),
-    .enableExperimentalFeature("StrictConcurrency=complete"),
 ] }
diff --git a/[email protected] b/[email protected]
@@ -13,8 +13,8 @@ let package = Package(
         .library(name: "FluentMySQLDriver", targets: ["FluentMySQLDriver"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.48.1"),
-        .package(url: "https://github.com/vapor/mysql-kit.git", from: "4.7.1"),
+        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.48.4"),
+        .package(url: "https://github.com/vapor/mysql-kit.git", from: "4.8.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
     ],
     targets: [

diff --git a/Sources/FluentMySQLDriver/FluentMySQLDriver.swift b/Sources/FluentMySQLDriver/FluentMySQLDriver.swift
@@ -27,6 +27,6 @@ struct _FluentMySQLDriver: DatabaseDriver {
 
     // See `DatabaseDriver.shutdown()`.
     func shutdown() {
-        self.pool.shutdown()
+        try? self.pool.syncShutdownGracefully()
     }
 }