mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-07-05 05:25:55 +00:00
Code Issues Projects Releases Wiki Activity

use actix-threadpool for blocking calls

Browse source
This commit is contained in:
Nikolay Kim 2019-03-28 05:16:43 -07:00
parent 4309d9b88c
commit 6e0fe7db2d
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Cargo.toml
View file

@ -70,11 +70,12 @@ actix-codec = "0.1.1"
actix-service = "0.3.4"
actix-utils = "0.3.4"
actix-router = "0.1.0"
actix-rt = "0.2.1"
actix-rt = "0.2.2"
actix-web-codegen = { path="actix-web-codegen" }
actix-http = { path = "actix-http", features=["fail"] }
actix-server = "0.4.1"
actix-server-config = "0.1.0"
actix-threadpool = "0.1.0"
awc = { path = "awc", optional = true }
bytes = "0.4"

8
src/error.rs
View file

@ -37,11 +37,11 @@ pub enum BlockingError<E: fmt::Debug> {
impl<E: fmt::Debug> ResponseError for BlockingError<E> {}
impl<E: fmt::Debug> From<actix_rt::blocking::BlockingError<E>> for BlockingError<E> {
fn from(err: actix_rt::blocking::BlockingError<E>) -> Self {
impl<E: fmt::Debug> From<actix_threadpool::BlockingError<E>> for BlockingError<E> {
fn from(err: actix_threadpool::BlockingError<E>) -> Self {
match err {
actix_rt::blocking::BlockingError::Error(e) => BlockingError::Error(e),
actix_rt::blocking::BlockingError::Canceled => BlockingError::Canceled,
actix_threadpool::BlockingError::Error(e) => BlockingError::Error(e),
actix_threadpool::BlockingError::Canceled => BlockingError::Canceled,
}
}
}

3
src/lib.rs
View file

@ -162,7 +162,6 @@ pub mod dev {
pub mod web {
//! Various types
use actix_http::{http::Method, Response};
use actix_rt::blocking;
use futures::{Future, IntoFuture};
pub use actix_http::Response as HttpResponse;
@ -339,7 +338,7 @@ pub mod web {
I: Send + 'static,
E: Send + std::fmt::Debug + 'static,
{
blocking::run(f).from_err()
actix_threadpool::run(f).from_err()
}
use actix_service::{fn_transform, Service, Transform};