Merge pull request #15 from mozilla/signals

Some more minor cleanup

Author: mythmon

Cargo.lock

@@ -9,7 +9,6 @@ actix = "^0.7.6"
 actix-web = "^0.7.14"
 chrono = { version = "^0.4", features = ["serde"] }
 config = { version = "^0.9.1", default_features = false }
-ctrlc = "^3.1.1"
 futures = "*"
 lazy_static = "^1.2.0"
 maxminddb = "^0.11.0"

Cargo.toml

@@ -40,19 +40,19 @@ impl actix_web::error::ResponseError for ClassifyError {
 impl From<MaxMindDBError> for ClassifyError {
     fn from(error: MaxMindDBError) -> Self {
         match error {
-            MaxMindDBError::AddressNotFoundError(msg) => ClassifyError {
+            MaxMindDBError::AddressNotFoundError(msg) => Self {
                 message: format!("AddressNotFound: {}", msg),
             },
-            MaxMindDBError::InvalidDatabaseError(msg) => ClassifyError {
+            MaxMindDBError::InvalidDatabaseError(msg) => Self {
                 message: format!("InvalidDatabaseError: {}", msg),
             },
-            MaxMindDBError::IoError(msg) => ClassifyError {
+            MaxMindDBError::IoError(msg) => Self {
                 message: format!("IoError: {}", msg),
             },
-            MaxMindDBError::MapError(msg) => ClassifyError {
+            MaxMindDBError::MapError(msg) => Self {
                 message: format!("MapError: {}", msg),
             },
-            MaxMindDBError::DecodingError(msg) => ClassifyError {
+            MaxMindDBError::DecodingError(msg) => Self {
                 message: format!("DecodingError: {}", msg),
             },
         }

src/errors.rs

@@ -12,9 +12,12 @@ use futures::Future;
 use maxminddb::{self, geoip2, MaxMindDBError};
 use serde::Serializer;
 use serde_derive::Serialize;
-use std::fs::File;
-use std::io::Read;
-use std::{net::IpAddr, net::Ipv4Addr, path::PathBuf, process};
+use std::{
+    fs::File,
+    io::Read,
+    net::{IpAddr, Ipv4Addr},
+    path::PathBuf,
+};
 
 use crate::{errors::ClassifyError, settings::Settings};
 
@@ -25,12 +28,6 @@ struct State {
 }
 
 fn main() {
-    // Rust doesn't have a ctrl-c handler itself, so when running as
-    // 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");
-
     let sys = actix::System::new("classify-client");
 
     let settings =