Skip to content

Commit 2553741

Browse files
committed
try to install redis
1 parent 0886cf6 commit 2553741

File tree

8 files changed

+13
-12
lines changed

8 files changed

+13
-12
lines changed

.github/workflows/pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
1717
with:
1818
linux_pre_build_command: apt-get update -y && apt-get install redis -y
19-
swift_flags:
19+
linux_exclude_swift_versions: "[{\"swift_version\": \"5.8\"}]"
2020
linux_env_vars: REDIS_URL=redis
21-
enable_windows_checks: false
21+
enable_windows_checks: false

.swift-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
},
2929
"rules" : {
3030
"NoBlockComments" : false,
31+
"DontRepeatTypeInStaticProperties" : false,
3132
"AllPublicDeclarationsHaveDocumentation" : false,
3233
"AlwaysUseLiteralForEmptyCollectionInit" : false,
3334
"AlwaysUseLowerCamelCase" : false,

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ When editing a file, ensure that the copyright header states the year `2019-<cur
3737

3838
### Git Workflow
3939

40-
`master` is always the development branch.
40+
`main` is always the development branch.
4141

4242
For **minor** or **patch** SemVer changes, create a branch off of the tagged commit.
4343

Sources/RediStack/ConnectionPool/RedisConnectionPool+Configuration.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ extension RedisConnectionPool {
138138
connectionRetryTimeout ?? .milliseconds(10) // always default to a baseline 10ms
139139
)
140140
self.onUnexpectedConnectionClose = onUnexpectedConnectionClose
141-
self.poolDefaultLogger = poolDefaultLogger ?? .redisBaseConnectionPool
141+
self.poolDefaultLogger = poolDefaultLogger ?? .redisBaseConnectionLoggerPool
142142
}
143143
}
144144
}

Sources/RediStack/RedisConnection+Configuration.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extension RedisConnection {
4343
}
4444
}
4545

46-
internal static let defaultLogger = Logger.redisBaseConnection
46+
internal static let defaultLogger = Logger.redisBaseConnectionLogger
4747

4848
/// The hostname of the connection address. If the address is a Unix socket, then it will be `nil`.
4949
public var hostname: String? {

Sources/RediStack/RedisLogging.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ public enum RedisLogging {
6060

6161
extension Logger {
6262
/// The prototypical instance used for Redis connections.
63-
public static var redisBaseConnection: Logger { RedisLogging.baseConnectionLogger }
63+
public static var redisBaseConnectionLogger: Logger { RedisLogging.baseConnectionLogger }
6464
/// The prototypical instance used for Redis connection pools.
65-
public static var redisBaseConnectionPool: Logger { RedisLogging.baseConnectionPoolLogger }
65+
public static var redisBaseConnectionPoolLogger: Logger { RedisLogging.baseConnectionPoolLogger }
6666
}
6767

6868
// MARK: Protocol-based Context Passing

Sources/RediStack/_Deprecations.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ extension RedisConnection {
5959
to socket: SocketAddress,
6060
on eventLoop: EventLoop,
6161
password: String? = nil,
62-
logger: Logger = .redisBaseConnection,
62+
logger: Logger = .redisBaseConnectionLogger,
6363
tcpClient: ClientBootstrap? = nil
6464
) -> EventLoopFuture<RedisConnection> {
6565
let config: Configuration
@@ -105,9 +105,9 @@ extension RedisConnectionPool {
105105
maximumConnectionCount: RedisConnectionPoolSize,
106106
minimumConnectionCount: Int = 1,
107107
connectionPassword: String? = nil, // config
108-
connectionLogger: Logger = .redisBaseConnection, // config
108+
connectionLogger: Logger = .redisBaseConnectionLogger, // config
109109
connectionTCPClient: ClientBootstrap? = nil,
110-
poolLogger: Logger = .redisBaseConnectionPool,
110+
poolLogger: Logger = .redisBaseConnectionLoggerPool,
111111
connectionBackoffFactor: Float32 = 2,
112112
initialConnectionBackoffDelay: TimeAmount = .milliseconds(100),
113113
connectionRetryTimeout: TimeAmount? = .seconds(60)

Tests/RediStackTests/ConnectionPoolTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ final class ConnectionPoolTests: XCTestCase {
3838
let channel = self.server.createConnectedChannel()
3939

4040
// Wrap it
41-
return RedisConnection(configuredRESPChannel: channel, backgroundLogger: .redisBaseConnection)
41+
return RedisConnection(configuredRESPChannel: channel, backgroundLogger: .redisBaseConnectionLogger)
4242
}
4343

4444
func createPool(maximumConnectionCount: Int, minimumConnectionCount: Int, leaky: Bool) -> ConnectionPool {
@@ -47,7 +47,7 @@ final class ConnectionPoolTests: XCTestCase {
4747
minimumConnectionCount: minimumConnectionCount,
4848
leaky: leaky,
4949
loop: self.server.loop,
50-
backgroundLogger: .redisBaseConnectionPool
50+
backgroundLogger: .redisBaseConnectionLoggerPool
5151
) { loop in
5252
loop.makeSucceededFuture(self.createAConnection())
5353
}

0 commit comments

Comments
 (0)