Skip to content
Open
Changes from all commits
Commits
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
Stop using ExecutionContext.global and receive ExecutionContext by th…
…e implicit parameter

I think that ExecutionContext should be chosen by users.
  • Loading branch information
okumin committed Sep 20, 2014
commit c85228767348ea18176dfc4560ced9f08842ad9f
9 changes: 3 additions & 6 deletions src/main/scala/com/redis/api/TransactionOperations.scala
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
package com.redis
package api

import scala.concurrent.ExecutionContext
import scala.util.{Success, Failure}
import serialization._
import akka.pattern.ask
import akka.util.Timeout
import com.redis.protocol.{TransactionCommands, Discarded}
import ExecutionContext.Implicits.global
import scala.concurrent.ExecutionContext

trait TransactionOperations { this: RedisOps =>
import TransactionCommands._
Expand All @@ -18,7 +15,7 @@ trait TransactionOperations { this: RedisOps =>
def exec()(implicit timeout: Timeout) =
clientRef.ask(Exec).mapTo[Exec.type#Ret]

def discard()(implicit timeout: Timeout) =
def discard()(implicit timeout: Timeout, executor: ExecutionContext) =
clientRef.ask(Discard).mapTo[Discard.type#Ret].map(_ => Discarded)

def watch(keys: Seq[String])(implicit timeout: Timeout) =
Expand All @@ -30,7 +27,7 @@ trait TransactionOperations { this: RedisOps =>
def unwatch()(implicit timeout: Timeout) =
clientRef.ask(Unwatch).mapTo[Unwatch.type#Ret]

def withTransaction(txn: RedisOps => Unit)(implicit timeout: Timeout) = {
def withTransaction(txn: RedisOps => Unit)(implicit timeout: Timeout, executor: ExecutionContext) = {
multi()
try {
txn(this)
Expand Down