matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-11-20 12:02:22 +03:00
Code Activity

Migrate /health

Browse Source
This commit is contained in:
Quentin Gliech
2022-03-25 10:51:55 +01:00
parent 9b5ecd5bc4
commit 5d3b4aa182
2 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/handlers/src/lib.rs
View File

@@ -34,7 +34,7 @@ mod health;
mod oauth2;
mod views;
use self::{health::filter as health, oauth2::filter as oauth2, views::filter as views};
use self::{oauth2::filter as oauth2, views::filter as views};
#[must_use]
pub fn root(
@@ -45,7 +45,6 @@ pub fn root(
mailer: &Mailer,
config: &RootConfig,
) -> BoxedFilter<(impl Reply,)> {
let health = health(pool);
let oauth2 = oauth2(pool, templates, key_store, encrypter, &config.http);
let views = views(
pool,
@@ -56,7 +55,7 @@ pub fn root(
&config.csrf,
);
let filter = health.or(views).unify().or(oauth2);
let filter = views.or(oauth2);
filter.with(warp::log(module_path!())).boxed()
}
@@ -72,6 +71,7 @@ pub fn router<B: Send + 'static>(
) -> Router<B> {
Router::new()
.route("/", get(self::views::index::get))
.route("/health", get(self::health::get))
.fallback(mas_static_files::Assets)
.layer(Extension(pool.clone()))
.layer(Extension(templates.clone()))