Skip to content

Commit 04306b8

Browse files
authored
Use Redis v4 release (#22)
1 parent 907aa8d commit 04306b8

2 files changed

Lines changed: 19 additions & 12 deletions

File tree

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ let package = Package(
1515
dependencies: [
1616
.package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
1717
.package(url: "https://github.com/vapor/queues.git", from: "1.0.0"),
18-
.package(url: "https://github.com/vapor/redis.git", from: "4.0.0-beta.6.1"),
18+
.package(url: "https://github.com/vapor/redis.git", from: "4.0.0"),
1919
],
2020
targets: [
2121
.target(

Sources/QueuesRedisDriver/JobsRedisDriver.swift

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,25 @@ public struct RedisQueuesDriver {
5151
/// - Parameters:
5252
/// - configuration: The `RedisConfiguration` to boot the driver
5353
/// - eventLoopGroup: The `EventLoopGroup` to run the driver with
54-
public init(configuration: RedisConfiguration, on eventLoopGroup: EventLoopGroup) {
54+
public init(configuration config: RedisConfiguration, on eventLoopGroup: EventLoopGroup) {
5555
let logger = Logger(label: "codes.vapor.redis")
56-
self.pool = .init(
57-
serverConnectionAddresses: configuration.serverAddresses,
58-
loop: eventLoopGroup.next(),
59-
maximumConnectionCount: configuration.pool.maximumConnectionCount,
60-
minimumConnectionCount: configuration.pool.minimumConnectionCount,
61-
connectionPassword: configuration.password,
62-
connectionLogger: logger,
63-
poolLogger: logger,
64-
connectionBackoffFactor: configuration.pool.connectionBackoffFactor,
65-
initialConnectionBackoffDelay: configuration.pool.initialConnectionBackoffDelay
56+
self.pool = RedisConnectionPool(
57+
configuration: .init(
58+
initialServerConnectionAddresses: config.serverAddresses,
59+
maximumConnectionCount: config.pool.maximumConnectionCount,
60+
connectionFactoryConfiguration: .init(
61+
connectionInitialDatabase: config.database,
62+
connectionPassword: config.password,
63+
connectionDefaultLogger: logger,
64+
tcpClient: nil
65+
),
66+
minimumConnectionCount: config.pool.minimumConnectionCount,
67+
connectionBackoffFactor: config.pool.connectionBackoffFactor,
68+
initialConnectionBackoffDelay: config.pool.initialConnectionBackoffDelay,
69+
connectionRetryTimeout: config.pool.connectionRetryTimeout,
70+
poolDefaultLogger: logger
71+
),
72+
boundEventLoop: eventLoopGroup.next()
6673
)
6774
}
6875

0 commit comments

Comments
 (0)