Skip to content

Wrap enqueueOperation in a try-catch #61

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

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

Wrap enqueueOperation in a try-catch #61

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
14 changes: 7 additions & 7 deletions src/main/scala/shade/memcached/internals/SpyMemcachedIntegration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ class SpyMemcachedIntegration(cf: ConnectionFactory, addrs: Seq[InetSocketAddres
}
})

mconn.enqueueOperation(key, op)
prepareFuture(key, op, promise, timeout)
}

Expand All @@ -225,7 +224,6 @@ class SpyMemcachedIntegration(cf: ConnectionFactory, addrs: Seq[InetSocketAddres
}
})

mconn.enqueueOperation(key, op)
prepareFuture(key, op, promise, timeout)
}

Expand All @@ -251,7 +249,6 @@ class SpyMemcachedIntegration(cf: ConnectionFactory, addrs: Seq[InetSocketAddres
}
})

mconn.enqueueOperation(key, op)
prepareFuture(key, op, promise, timeout)
}

Expand All @@ -276,7 +273,6 @@ class SpyMemcachedIntegration(cf: ConnectionFactory, addrs: Seq[InetSocketAddres
}
})

mconn.enqueueOperation(key, op)
prepareFuture(key, op, promise, timeout)
}

Expand Down Expand Up @@ -307,7 +303,6 @@ class SpyMemcachedIntegration(cf: ConnectionFactory, addrs: Seq[InetSocketAddres
}
})

mconn.enqueueOperation(key, op)
prepareFuture(key, op, promise, timeout)
}

Expand Down Expand Up @@ -336,7 +331,6 @@ class SpyMemcachedIntegration(cf: ConnectionFactory, addrs: Seq[InetSocketAddres
}
})

mconn.enqueueOperation(key, op)
prepareFuture(key, op, promise, timeout)
}

Expand All @@ -362,11 +356,17 @@ class SpyMemcachedIntegration(cf: ConnectionFactory, addrs: Seq[InetSocketAddres
}
})

mconn.enqueueOperation(key, op)
prepareFuture(key, op, promise, timeout)
}

protected final def prepareFuture[T](key: String, op: Operation, promise: Promise[Result[T]], atMost: FiniteDuration)(implicit ec: ExecutionContext): CancelableFuture[Result[T]] = {
try {
mconn.enqueueOperation(key, op)
} catch {
// enqueueOperation can throw IllegalStateException when
// the queue is full (see #60)
case NonFatal(e) => promise.tryFailure(e)
}
val operationCancelable = Cancelable(() => {
try {
if (!op.isCancelled)
Expand Down