Segregate Query Answering

src/main.rs

@@ -8,6 +8,7 @@ use std::io::{self, BufRead, BufReader};
 use std::error::Error;
 use std::str::FromStr;
 use std::fs;
+use std::time::SystemTime;
 
 use importers::Importer;
 use importers::file::FileImporter;
@@ -69,7 +70,7 @@ fn main() -> Result<(), io::Error> {
     }
     // data locations: vec!["../../data/data.csv","data/data.csv","data.csv","data_full.csv"]
 
-    markov_chain = read_from_db(config.clone(), markov_chain);
+    read_from_db(config.clone(), &mut markov_chain);
 
     // let term_frequency_threshold = match config.get("term_frequency_threshold") {
     //     Some(toml::Value::Integer(n)) if *n >= 0 => *n as usize,
@@ -92,7 +93,14 @@ fn main() -> Result<(), io::Error> {
     let server = Server::http("0.0.0.0:8000").unwrap();
 
     for request in server.incoming_requests() {
-        //   println!("received request! method: {:?}, url: {:?}, headers: {:?}",
+        process_request(request, config.clone(), &mut markov_chain, last_update)
+    }
+
+    Ok(())
+}
+
+fn process_request(request: tiny_http::Request, config: HashMap<String, String>, markov_chain: &mut CompositePredictor, mut last_update: SystemTime) {
+    //   println!("received request! method: {:?}, url: {:?}, headers: {:?}",
         //       request.method(),
         //       request.url(),
         //       request.headers()
@@ -110,7 +118,7 @@ fn main() -> Result<(), io::Error> {
                                 if client_auth != server_auth.clone() {
                                     println!("invalid auth:{}, server auth: {}", client_auth, server_auth);
                                     request.respond(Response::from_string(""));
-                                    continue;
+                                    return;
                                 }
                             },
                             _ => {}
@@ -133,7 +141,7 @@ fn main() -> Result<(), io::Error> {
                 let elapsed = now.duration_since(last_update).expect("Time went backwards");
                 if elapsed >= std::time::Duration::from_secs(24 * 60 * 60) {
                     markov_chain.decay();
-                    markov_chain = read_from_db(config.clone(), markov_chain);
+                    read_from_db(config.clone(), markov_chain);
                     last_update = now;
                 }
             },
@@ -141,13 +149,9 @@ fn main() -> Result<(), io::Error> {
                 //println!("Error: {}",e);
             }
         }
-    }
-
-    Ok(())
 }
 
-
-fn read_from_db(config: HashMap<String, String>, mut predictor: CompositePredictor) -> CompositePredictor {
+fn read_from_db(config: HashMap<String, String>, predictor: &mut CompositePredictor) {
 
     let mut raw_list = String::new();
     let blocklist: Vec<&str> = match config.get("blocklist") {
@@ -180,23 +184,23 @@ fn read_from_db(config: HashMap<String, String>, mut predictor: CompositePredict
                                 count += 1;
                             }
                             println!("{} queries read from DB", count);
-                            predictor
+                            
                         },
                         Err(e) => {
                             println!("Error while reading from DB: {}", e);
-                            predictor
+                            
                         }
                     }
                 },
                 Err(e) => {
                     println!("Error while connecting to DB: {}", e);
-                    predictor
+                    
                 }
             }
         },
         _ => {
             println!("No DB config found. Skipping...");
-            predictor
+            
         }
     }