actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-27 17:22:57 +01:00
Code Issues Releases Wiki Activity

removed map combinators

Browse Source
This commit is contained in:
dowwie 2019-12-18 15:07:47 -05:00
parent 512fe9c0e0
commit 2d6ff41563
1 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/session.rs
View File

@ -221,44 +221,42 @@ impl Inner {
let value = cookie.value().to_owned(); let value = cookie.value().to_owned();
let cachekey = (self.cache_keygen)(&cookie.value()); let cachekey = (self.cache_keygen)(&cookie.value());
return return
self.addr.send(Command(resp_array!["GET", cachekey])).map( match self.addr.send(Command(resp_array!["GET", cachekey]))
|result| match result { .await {
Err(e) => Err(Error::from(e)), Err(e) => Err(Error::from(e)),
Ok(res) => match res { Ok(res) => match res {
Ok(val) => { Ok(val) => {
match val { match val {
RespValue::Error(err) => { RespValue::Error(err) => {
return Err( return Err(
error::ErrorInternalServerError( error::ErrorInternalServerError(
err, err,
), ),
); );
}
RespValue::SimpleString(s) => {
if let Ok(val) =
serde_json::from_str(&s)
{
return Ok(Some((val, value)));
}
}
RespValue::BulkString(s) => {
if let Ok(val) =
serde_json::from_slice(&s)
{
return Ok(Some((val, value)));
}
}
_ => (),
} }
Ok(None) RespValue::SimpleString(s) => {
if let Ok(val) =
serde_json::from_str(&s)
{
return Ok(Some((val, value)));
}
}
RespValue::BulkString(s) => {
if let Ok(val) =
serde_json::from_slice(&s)
{
return Ok(Some((val, value)));
}
}
_ => (),
} }
Err(err) => { Ok(None)
Err(error::ErrorInternalServerError(err)) }
} Err(err) => {
}, Err(error::ErrorInternalServerError(err))
}
}, },
) }
.await;
} else { } else {
return Ok(None) return Ok(None)
} }
@ -312,10 +310,10 @@ impl Inner {
let state: HashMap<_, _> = state.collect(); let state: HashMap<_, _> = state.collect();
match serde_json::to_string(&state) { match serde_json::to_string(&state) {
Err(e) => Err(e.into()), Err(e) => Err(e.into()),
Ok(body) => Ok(body) => {
self.addr match self.addr
.send(Command(resp_array!["SET", cachekey, body, "EX", &self.ttl])) .send(Command(resp_array!["SET", cachekey, body, "EX", &self.ttl]))
.map(|result| match result { .await {
Err(e) => Err(Error::from(e)), Err(e) => Err(Error::from(e)),
Ok(redis_result) => match redis_result { Ok(redis_result) => match redis_result {
Ok(_) => { Ok(_) => {
@ -331,8 +329,8 @@ impl Inner {
} }
Err(err) => Err(error::ErrorInternalServerError(err)), Err(err) => Err(error::ErrorInternalServerError(err)),
}, },
}) }
.await, }
} }
} }
@ -340,9 +338,9 @@ impl Inner {
async fn clear_cache(&self, key: String) -> Result<(), Error> { async fn clear_cache(&self, key: String) -> Result<(), Error> {
let cachekey = (self.cache_keygen)(&key); let cachekey = (self.cache_keygen)(&key);
self.addr match self.addr
.send(Command(resp_array!["DEL", cachekey])) .send(Command(resp_array!["DEL", cachekey]))
.map(|res| match res { .await {
Err(e) => Err(Error::from(e)), Err(e) => Err(Error::from(e)),
Ok(res) => { Ok(res) => {
match res { match res {
@ -353,8 +351,7 @@ impl Inner {
)), )),
} }
} }
}) }
.await
} }
/// invalidates session cookie /// invalidates session cookie