Ferme correctement les thread

README.md

@@ -2,7 +2,11 @@
 
 ## Usage
 
-Mettre son token dans le fichier `src/main.rs`
+Mettre un token valid dans le fichier `src/main.rs`
+
+### Serveur Web
+
+Développer en se basant sur : https://doc.rust-lang.org/book/ch20-00-final-project-a-web-server.html
 
 ## Ressources
 

src/lib.rs

@@ -5,7 +5,7 @@ use std::{
 
 pub struct ThreadPool {
     workers: Vec<Worker>,
-    sender: mpsc::Sender<Job>,
+    sender: Option<mpsc::Sender<Job>>
 }
 
 type Job = Box<dyn FnOnce() + Send + 'static>;
@@ -31,7 +31,10 @@ impl ThreadPool {
             workers.push(Worker::new(id, Arc::clone(&receiver)));
         }
 
-        ThreadPool { workers, sender }
+        ThreadPool {
+            workers,
+            sender: Some(sender)
+        }
     }
 
     pub fn execute<F>(&self, f: F)
@@ -39,26 +42,50 @@ impl ThreadPool {
         F: FnOnce() + Send + 'static,
     {
         let job = Box::new(f);
+        self.sender.as_ref().unwrap().send(job).unwrap();
+    }
+}
+
+impl Drop for ThreadPool {
+    fn drop(&mut self) {
+        drop(self.sender.take());
 
-        self.sender.send(job).unwrap();
+        for worker in &mut self.workers {
+            println!("Shutting down worker {}", worker.id);
+
+            if let Some(thread) = worker.thread.take() {
+                thread.join().unwrap();
+            }
+        }
     }
 }
 
 struct Worker {
     id: usize,
-    thread: thread::JoinHandle<()>,
+    thread: Option<thread::JoinHandle<()>>,
 }
 
 impl Worker {
     fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
         let thread = thread::spawn(move || loop {
-            let job = receiver.lock().unwrap().recv().unwrap();
+            let message = receiver.lock().unwrap().recv();
 
-            println!("Worker {id} got a job; executing.");
+            match message {
+                Ok(job) => {
+                    println!("Worker {id} got a job; executing.");
 
-            job();
+                    job();
+                }
+                Err(_) => {
+                    println!("Worker {id} disconnected; shutting down.");
+                    break;
+                }
+            }
         });
 
-        Worker { id, thread }
+        Worker {
+            id,
+            thread: Some(thread),
+        }
     }
 }

src/main.rs

@@ -25,8 +25,6 @@ fn handle_connection(mut stream: TcpStream) {
         _ => ("HTTP/1.1 404 NOT FOUND", "pages/404.html"),
     };
 
-    // --snip--
-
     let contents = fs::read_to_string(filename).unwrap();
     let length = contents.len();
 
@@ -47,11 +45,12 @@ fn webserver() {
             handle_connection(stream);
         });
     }
+    println!("Shutting down.");
 }
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
-    let server = "https://redmine.cli.coop";//https://api.coinstats.app/public/v1/coins/dogecoin
+    let server = "https://redmine.cli.coop";
     let token = "[TOKEN]";
     let target = "issues.json";
     let option = "limit=2";