zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

fix: dont make context for migration or db for cfg

Browse source
This commit is contained in:
əlemi 2024-06-06 05:37:27 +02:00
parent 3c1aa4909e
commit e3328954e2
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
main.rs
View file

@ -116,6 +116,11 @@ async fn main() {
let config = upub::Config::load(args.config);
if matches!(args.command, Mode::Config) {
println!("{}", toml::to_string_pretty(&config).expect("failed serializing config"));
return;
}
let database = args.database.unwrap_or(config.datasource.connection_string.clone());
let domain = args.domain.unwrap_or(config.instance.domain.clone());
@ -137,20 +142,21 @@ async fn main() {
let db = Database::connect(opts)
.await.expect("error connecting to db");
#[cfg(feature = "migrate")]
if matches!(args.command, Mode::Migrate) {
use migrations::MigratorTrait;
migrations::Migrator::up(&db, None)
.await
.expect("error applying migrations");
return;
}
let ctx = upub::Context::new(db, domain, config.clone())
.await.expect("failed creating server context");
#[cfg(feature = "migrate")]
use migrations::MigratorTrait;
match args.command {
Mode::Config => println!("{}", toml::to_string_pretty(&config).expect("failed serializing config")),
#[cfg(feature = "migrate")]
Mode::Migrate =>
migrations::Migrator::up(ctx.db(), None)
.await.expect("error applying migrations"),
#[cfg(feature = "cli")]
Mode::Cli { command } =>
cli::run(ctx, command)
@ -173,6 +179,8 @@ async fn main() {
routes::serve(ctx, bind)
.await.expect("failed serving api routes");
},
_ => unreachable!(),
}
}