diff --git a/casper-server/src/lua/http/body.rs b/casper-server/src/lua/http/body.rs index f10a0f8..d04f0d6 100644 --- a/casper-server/src/lua/http/body.rs +++ b/casper-server/src/lua/http/body.rs @@ -82,9 +82,8 @@ impl LuaBody { match self { LuaBody::None => Ok(None), LuaBody::Bytes(bytes) => Ok(Some(bytes.clone())), - _ => Ok(self.read().await?.map(|b| { + _ => Ok(self.read().await?.inspect(|b| { *self = LuaBody::Bytes(b.clone()); - b })), } } diff --git a/casper-server/src/lua/storage.rs b/casper-server/src/lua/storage.rs index 790d6da..0cca839 100644 --- a/casper-server/src/lua/storage.rs +++ b/casper-server/src/lua/storage.rs @@ -145,7 +145,7 @@ where .into_iter() .map(|res| match res { Ok(_) => Ok(Value::Boolean(true)), - Err(err) => Ok(Value::String(lua.create_string(&err.into().to_string())?)), + Err(err) => Ok(Value::String(lua.create_string(err.into().to_string())?)), }) .collect::>>()?; Ok((false, Some(results))) @@ -285,7 +285,7 @@ where .into_iter() .map(|res| match res { Ok(size) => Ok(Value::Integer(size as _)), - Err(err) => Ok(Value::String(lua.create_string(&err.into().to_string())?)), + Err(err) => Ok(Value::String(lua.create_string(err.into().to_string())?)), }) .collect::>>()?; Ok((None, Some(results))) diff --git a/casper-server/src/middleware/trace.rs b/casper-server/src/middleware/trace.rs index 3499046..182dd03 100644 --- a/casper-server/src/middleware/trace.rs +++ b/casper-server/src/middleware/trace.rs @@ -135,10 +135,9 @@ where ResponseBody::Other(Body::from_message(StreamSpan { body, otel_cx })) }) }) - .map_err(|err| { + .inspect_err(|err| { let span = otel_cx.span(); span.set_status(trace::Status::error(err.to_string())); - err }) } } diff --git a/casper-server/src/storage/backends/redis/client.rs b/casper-server/src/storage/backends/redis/client.rs index 1598f82..94f52e3 100644 --- a/casper-server/src/storage/backends/redis/client.rs +++ b/casper-server/src/storage/backends/redis/client.rs @@ -430,7 +430,7 @@ impl RedisBackend { num_chunks += 1; // Store chunk in Redis self.pool - .set( + .set::<(), _, _>( make_chunk_key(&item.key, i as u32 + 1), RedisValue::Bytes(chunk.to_vec().into()), Some(Expiration::EX(ttl as i64)), @@ -458,7 +458,7 @@ impl RedisBackend { // Store response item self.pool - .set( + .set::<(), _, _>( make_redis_key(&item.key), RedisValue::Bytes(response_item_enc.into()), Some(Expiration::EX(ttl as i64)), @@ -505,7 +505,7 @@ impl RedisBackend { if refresh_ttl && rand::random::() % 100 < 1 { // Refresh TTL with 1% probability self.pool - .expire(make_redis_key(&skey), SURROGATE_KEYS_TTL) + .expire::<(), _>(make_redis_key(&skey), SURROGATE_KEYS_TTL) .await?; } anyhow::Ok(())