matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-09 10:01:45 +03:00
Code Activity

Ability to run migrations on startup

Browse Source 
Also adds a bunch of logging information on startup
This commit is contained in:
Quentin Gliech
2021-09-17 11:27:06 +02:00
parent 4fbac80898
commit 789ace84fd
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
crates/cli/src/server.rs
View File

@ -22,6 +22,7 @@ use clap::Clap;
use hyper::{header, Server};
use mas_config::RootConfig;
use mas_core::{
storage::MIGRATOR,
tasks::{self, TaskQueue},
templates::Templates,
};
@ -32,11 +33,16 @@ use tower_http::{
trace::{DefaultMakeSpan, DefaultOnResponse, TraceLayer},
LatencyUnit,
};
use tracing::info;
use super::RootCommand;
#[derive(Clap, Debug, Default)]
pub(super) struct ServerCommand;
pub(super) struct ServerCommand {
/// Automatically apply pending migrations
#[clap(long)]
migrate: bool,
}
impl ServerCommand {
pub async fn run(&self, root: &RootCommand) -> anyhow::Result<()> {
@ -48,6 +54,19 @@ impl ServerCommand {
// Connect to the database
let pool = config.database.connect().await?;
if self.migrate {
info!("Running pending migrations");
MIGRATOR
.run(&pool)
.await
.context("could not run migrations")?;
}
info!("Starting task scheduler");
let queue = TaskQueue::default();
queue.recuring(Duration::from_secs(15), tasks::cleanup_expired(&pool));
queue.start();
// Load and compile the templates
// TODO: custom template path from the config
let templates = Templates::load(None, true).context("could not load templates")?;
@ -55,10 +74,6 @@ impl ServerCommand {
// Start the server
let root = mas_core::handlers::root(&pool, &templates, &config);
let queue = TaskQueue::default();
queue.recuring(Duration::from_secs(15), tasks::cleanup_expired(&pool));
queue.start();
let warp_service = warp::service(root);
let service = ServiceBuilder::new()
@ -83,7 +98,7 @@ impl ServerCommand {
]))
.service(warp_service);
tracing::info!("Listening on http://{}", listener.local_addr().unwrap());
info!("Listening on http://{}", listener.local_addr().unwrap());
Server::from_tcp(listener)?
.serve(Shared::new(service))