Read VERSION_FILE location from env

Author: leplatrem

README.md

@@ -24,6 +24,7 @@ Via environment variables:
 - `HOST`: host (default: `localhost`)
 - `PORT`: port number (default: `8080`)
 - `GEOIP_DB_PATH`: path to GeoIP database (default: `./GeoLite2-Country.mmdb`)
+- `VERSION_FILE`: path to `version.json` file (default: `./version.json`)
 
 ## Tests
 

src/main.rs

@@ -21,6 +21,7 @@ use crate::{errors::ClassifyError, settings::Settings};
 #[derive(Clone)]
 struct State {
     geoip: actix::Addr<GeoIpActor>,
+    settings: settings::Settings,
 }
 
 fn main() {
@@ -47,9 +48,9 @@ fn main() {
         })
     };
 
-    let state = State { geoip };
+    let state = State { geoip, settings };
 
-    let addr = format!("{}:{}", settings.host, settings.port);
+    let addr = format!("{}:{}", state.settings.host, state.settings.port);
     let server = actix_web::server::new(move || {
         App::with_state(state.clone())
             .resource("/", |r| r.get().f(index))
@@ -233,8 +234,10 @@ fn heartbeat(req: &HttpRequest<State>) -> FutureResponse<HttpResponse> {
     )
 }
 
-fn version(_req: &HttpRequest<State>) -> HttpResponse {
-    let mut file = File::open("./version.json").unwrap();
+fn version(req: &HttpRequest<State>) -> HttpResponse {
+    let version_file = &req.state().settings.version_file;
+    // Read the file or deliberately fail with a 500 if missing.
+    let mut file = File::open(version_file).unwrap();
     let mut data = String::new();
     file.read_to_string(&mut data).unwrap();
     HttpResponse::Ok()

src/settings.rs

@@ -7,6 +7,7 @@ pub struct Settings {
     pub host: String,
     pub port: u16,
     pub geoip_db_path: PathBuf,
+    pub version_file: PathBuf,
 }
 
 impl Default for Settings {
@@ -15,6 +16,7 @@ impl Default for Settings {
             host: "[::]".to_owned(),
             port: 8080,
             geoip_db_path: "./GeoLite2-Country.mmdb".into(),
+            version_file: "./version.json".into(),
         }
     }
 }