Skip to content

Commit 380931e

Browse files
committed
background_jobs: Remove unused AddCrate job
This has been replaced by the two `SyncToGit/SparseIndex` jobs
1 parent e0f31b3 commit 380931e

File tree

3 files changed

+4
-37
lines changed

3 files changed

+4
-37
lines changed

src/background_jobs.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ macro_rules! job_variant_from_value {
7070

7171
jobs! {
7272
pub enum Job {
73-
AddCrate(AddCrateJob),
7473
DailyDbMaintenance,
7574
DumpDb(DumpDbJob),
7675
NormalizeIndex(NormalizeIndexJob),
@@ -124,10 +123,6 @@ impl Job {
124123
Ok(())
125124
}
126125

127-
pub fn add_crate(krate: cargo_registry_index::Crate) -> Self {
128-
Self::AddCrate(AddCrateJob { krate })
129-
}
130-
131126
pub fn daily_db_maintenance() -> Self {
132127
Self::DailyDbMaintenance
133128
}
@@ -208,7 +203,6 @@ impl Job {
208203
worker::perform_daily_db_maintenance(&mut *fresh_connection(pool)?)
209204
}
210205
Job::DumpDb(args) => worker::perform_dump_db(env, args.database_url, args.target_name),
211-
Job::AddCrate(args) => worker::perform_index_add_crate(env, conn, &args.krate),
212206
Job::SquashIndex => worker::perform_index_squash(env),
213207
Job::UpdateCrateIndex(args) => worker::perform_index_sync_to_http(env, args.crate_name),
214208
Job::NormalizeIndex(args) => worker::perform_normalize_index(env, args),

src/worker/git.rs

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,14 @@
1-
use crate::background_jobs::{Environment, Job, NormalizeIndexJob};
1+
use crate::background_jobs::{Environment, NormalizeIndexJob};
22
use crate::models;
33
use crate::swirl::PerformError;
44
use anyhow::Context;
55
use cargo_registry_index::{Crate, Repository};
66
use chrono::Utc;
77
use diesel::prelude::*;
8-
use std::fs::{self, File, OpenOptions};
8+
use std::fs::{self, File};
99
use std::io::{BufRead, BufReader, ErrorKind, Write};
1010
use std::process::Command;
1111

12-
#[instrument(skip_all, fields(krate.name = ?krate.name, krate.vers = ?krate.vers))]
13-
pub fn perform_index_add_crate(
14-
env: &Environment,
15-
conn: &mut PgConnection,
16-
krate: &Crate,
17-
) -> Result<(), PerformError> {
18-
info!("Adding {}#{} to the git index", krate.name, krate.vers);
19-
20-
use std::io::prelude::*;
21-
22-
let repo = env.lock_index()?;
23-
let dst = repo.index_file(&krate.name);
24-
25-
// Add the crate to its relevant file
26-
fs::create_dir_all(dst.parent().unwrap())?;
27-
let mut file = OpenOptions::new().append(true).create(true).open(&dst)?;
28-
serde_json::to_writer(&mut file, &krate)?;
29-
file.write_all(b"\n")?;
30-
31-
let message: String = format!("Update crate `{}#{}`", krate.name, krate.vers);
32-
repo.commit_and_push(&message, &dst)?;
33-
34-
// Queue another background job to update the http-based index as well.
35-
Job::update_crate_index(krate.name.clone()).enqueue(conn)?;
36-
Ok(())
37-
}
38-
3912
#[instrument(skip(env))]
4013
pub fn perform_index_sync_to_http(
4114
env: &Environment,

src/worker/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ mod update_downloads;
1313
pub(crate) use daily_db_maintenance::perform_daily_db_maintenance;
1414
pub(crate) use dump_db::perform_dump_db;
1515
pub(crate) use git::{
16-
perform_index_add_crate, perform_index_squash, perform_index_sync_to_http,
17-
perform_normalize_index, sync_to_git_index, sync_to_sparse_index,
16+
perform_index_squash, perform_index_sync_to_http, perform_normalize_index, sync_to_git_index,
17+
sync_to_sparse_index,
1818
};
1919
pub(crate) use readmes::perform_render_and_upload_readme;
2020
pub(crate) use update_downloads::perform_update_downloads;

0 commit comments

Comments
 (0)