diff --git a/src/background_jobs.rs b/src/background_jobs.rs index 51a9a7902dd..4ed29fe1278 100644 --- a/src/background_jobs.rs +++ b/src/background_jobs.rs @@ -241,7 +241,7 @@ impl Job { } pub(super) fn perform( - self, + &self, env: &Option, state: PerformState<'_>, ) -> Result<(), PerformError> { @@ -253,7 +253,9 @@ impl Job { Job::DailyDbMaintenance => { worker::perform_daily_db_maintenance(&mut *fresh_connection(pool)?) } - Job::DumpDb(args) => worker::perform_dump_db(env, args.database_url, args.target_name), + Job::DumpDb(args) => { + worker::perform_dump_db(env, &args.database_url, &args.target_name) + } Job::SquashIndex => worker::perform_index_squash(env), Job::NormalizeIndex(args) => worker::perform_normalize_index(env, args), Job::RenderAndUploadReadme(args) => worker::perform_render_and_upload_readme( diff --git a/src/worker/dump_db.rs b/src/worker/dump_db.rs index 13b24a74f4f..742526f96b3 100644 --- a/src/worker/dump_db.rs +++ b/src/worker/dump_db.rs @@ -13,13 +13,13 @@ use crate::swirl::PerformError; /// tarball and upload to S3. pub fn perform_dump_db( env: &Environment, - database_url: String, - target_name: String, + database_url: &str, + target_name: &str, ) -> Result<(), PerformError> { let directory = DumpDirectory::create()?; info!(path = ?directory.export_dir, "Begin exporting database"); - directory.populate(&database_url)?; + directory.populate(database_url)?; info!(path = ?directory.export_dir, "Creating tarball"); let tarball = DumpTarball::create(&directory.export_dir)?; @@ -33,11 +33,11 @@ pub fn perform_dump_db( let storage = Storage::from_environment(); - rt.block_on(storage.upload_db_dump(&target_name, &tarball.tarball_path))?; + rt.block_on(storage.upload_db_dump(target_name, &tarball.tarball_path))?; info!("Database dump tarball uploaded"); info!("Invalidating CDN caches"); - invalidate_caches(env, &target_name); + invalidate_caches(env, target_name); Ok(()) } diff --git a/src/worker/git.rs b/src/worker/git.rs index 04d8c820303..3cf0d718b58 100644 --- a/src/worker/git.rs +++ b/src/worker/git.rs @@ -160,7 +160,7 @@ pub fn perform_index_squash(env: &Environment) -> Result<(), PerformError> { pub fn perform_normalize_index( env: &Environment, - args: NormalizeIndexJob, + args: &NormalizeIndexJob, ) -> Result<(), PerformError> { info!("Normalizing the index");