Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable setting connect timeout for each RedisServer #233

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable setting connect timeout for each RedisServer #233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/main/scala/redis/RedisPool.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@ import scala.concurrent.{Future, ExecutionContext}
import redis.protocol.RedisReply
import redis.commands.Transactions

import scala.concurrent.duration.FiniteDuration

case class RedisServer(host: String = "localhost",
port: Int = 6379,
password: Option[String] = None,
db: Option[Int] = None)
db: Option[Int] = None,
connectTimeout: Option[FiniteDuration] = None)


case class RedisConnection(actor: ActorRef, active: Ref[Boolean] = Ref(false))
Expand Down Expand Up @@ -86,14 +89,14 @@ abstract class RedisClientPoolLike(system: ActorSystem, redisDispatcher: RedisDi
}
}

def makeRedisConnection(server: RedisServer, defaultActive: Boolean = false) = {
def makeRedisConnection(server: RedisServer, defaultActive: Boolean = false): (RedisServer, RedisConnection) = {
val active = Ref(defaultActive)
(server, RedisConnection(makeRedisClientActor(server, active), active))
}

def makeRedisClientActor(server: RedisServer, active: Ref[Boolean]): ActorRef = {
private def makeRedisClientActor(server: RedisServer, active: Ref[Boolean]): ActorRef = {
system.actorOf(RedisClientActor.props(new InetSocketAddress(server.host, server.port),
getConnectOperations(server), onConnectStatus(server, active), redisDispatcher.name)
getConnectOperations(server), onConnectStatus(server, active), redisDispatcher.name, server.connectTimeout)
.withDispatcher(redisDispatcher.name),
name + '-' + Redis.tempName()
)
Expand Down Expand Up @@ -160,7 +163,7 @@ case class RedisClientMasterSlaves(master: RedisServer,
extends RedisCommands with Transactions {
implicit val executionContext = _system.dispatchers.lookup(redisDispatcher.name)

val masterClient = RedisClient(master.host, master.port, master.password, master.db)
val masterClient = RedisClient(master.host, master.port, master.password, master.db, connectTimeout = master.connectTimeout)

val slavesClients = RedisClientPool(slaves)

Expand Down