vw_small

Hardened fork of Vaultwarden (https://github.com/dani-garcia/vaultwarden) with fewer features.
git clone https://git.philomathiclife.com/repos/vw_small
Log | Files | Refs | README

commit 078234d8b3b8524e82a18c802fda6f3bccc6fc9f
parent 3ce0c3d1a555f459e56a5b7ec5eb7616555a3a72
Author: BlackDex <black.dex@gmail.com>
Date:   Mon, 16 Mar 2020 16:36:44 +0100

Small change for rocket compatibilty

Diffstat:
Msrc/db/mod.rs | 3++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/db/mod.rs b/src/db/mod.rs @@ -76,7 +76,8 @@ impl<'a, 'r> FromRequest<'a, 'r> for DbConn { type Error = (); fn from_request(request: &'a Request<'r>) -> request::Outcome<DbConn, ()> { - let pool = request.guard::<State<Pool>>()?; + // https://github.com/SergioBenitez/Rocket/commit/e3c1a4ad3ab9b840482ec6de4200d30df43e357c + let pool = try_outcome!(request.guard::<State<Pool>>()); match pool.get() { Ok(conn) => Outcome::Success(DbConn(conn)), Err(_) => Outcome::Failure((Status::ServiceUnavailable, ())),