From 24aafd5bb22a8aafc274c6e86d02fb21004bab0b Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Wed, 12 Dec 2018 14:10:36 -0800
Subject: [PATCH] Cleanup geoip reader initialization

---
 src/main.rs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 544f799..95ea2e2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,7 +11,7 @@ use listenfd::ListenFd;
 use maxminddb::{self, geoip2, MaxMindDBError};
 use serde::Serializer;
 use serde_derive::Serialize;
-use std::{env, fmt, net::IpAddr, path, process};
+use std::{env, fmt, net::IpAddr, path::PathBuf, process};
 
 struct State {
     geoip: actix::Addr<GeoIpActor>,
@@ -22,22 +22,18 @@ fn main() {
     // PID 1 in Docker it doesn't respond to SIGINT. This prevents
     // ctrl-c from stopping a docker container running this
     // program. Handle SIGINT (aka ctrl-c) to fix this problem.
-    ctrlc::set_handler(move || {
-        process::exit(0);
-    })
-    .expect("error setting ctrl-c handler");
+    ctrlc::set_handler(move || process::exit(0)).expect("error setting ctrl-c handler");
 
     let sys = actix::System::new("classify-client");
 
     let geoip = actix::SyncArbiter::start(1, || {
-        let geoip_path: path::PathBuf = "./GeoLite2-Country.mmdb".into();
-        let reader = maxminddb::Reader::open(&geoip_path).unwrap_or_else(|err| {
+        let geoip_path = "./GeoLite2-Country.mmdb";
+        GeoIpActor::from_path(&geoip_path).unwrap_or_else(|err| {
             panic!(format!(
                 "Could not open geoip database at {:?}: {}",
                 geoip_path, err
             ))
-        });
-        GeoIpActor { reader }
+        })
     });
 
     let server = actix_web::server::new(move || {
@@ -95,6 +91,14 @@ struct GeoIpActor {
     reader: maxminddb::OwnedReader<'static>,
 }
 
+impl GeoIpActor {
+    fn from_path<P: Into<PathBuf>>(path: P) -> Result<Self, Box<dyn std::error::Error>> {
+        let path = path.into();
+        let reader = maxminddb::Reader::open(path)?;
+        Ok(Self { reader })
+    }
+}
+
 impl<'a> actix::Actor for GeoIpActor {
     type Context = actix::SyncContext<Self>;
 }