Merge pull request #7404 from Turbo87/simplify-environment

background_jobs: Simplify `Environment` struct

src/background_jobs.rs

@@ -317,7 +317,7 @@ pub struct RenderAndUploadReadmeJob {
 }
 
 pub struct Environment {
-    index: Arc<Mutex<Repository>>,
+    index: Mutex<Repository>,
     http_client: AssertUnwindSafe<Client>,
     cloudfront: Option<CloudFront>,
     fastly: Option<Fastly>,
@@ -331,25 +331,9 @@ impl Environment {
         cloudfront: Option<CloudFront>,
         fastly: Option<Fastly>,
         storage: Arc<Storage>,
-    ) -> Self {
-        Self::new_shared(
-            Arc::new(Mutex::new(index)),
-            http_client,
-            cloudfront,
-            fastly,
-            storage,
-        )
-    }
-
-    pub fn new_shared(
-        index: Arc<Mutex<Repository>>,
-        http_client: Client,
-        cloudfront: Option<CloudFront>,
-        fastly: Option<Fastly>,
-        storage: Arc<Storage>,
     ) -> Self {
         Self {
-            index,
+            index: Mutex::new(index),
             http_client: AssertUnwindSafe(http_client),
             cloudfront,
             fastly,

src/bin/background-worker.rs

@@ -25,7 +25,7 @@ use diesel::r2d2;
 use diesel::r2d2::ConnectionManager;
 use reqwest::blocking::Client;
 use secrecy::ExposeSecret;
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 use std::thread::sleep;
 use std::time::{Duration, Instant};
 
@@ -66,9 +66,7 @@ fn main() {
 
     let clone_start = Instant::now();
     let repository_config = RepositoryConfig::from_environment();
-    let repository = Arc::new(Mutex::new(
-        Repository::open(&repository_config).expect("Failed to clone index"),
-    ));
+    let repository = Repository::open(&repository_config).expect("Failed to clone index");
 
     let clone_duration = clone_start.elapsed();
     info!(duration = ?clone_duration, "Index cloned");
@@ -82,7 +80,7 @@ fn main() {
         .build()
         .expect("Couldn't build client");
 
-    let environment = Environment::new_shared(repository, client, cloudfront, fastly, storage);
+    let environment = Environment::new(repository, client, cloudfront, fastly, storage);
 
     let environment = Arc::new(Some(environment));