Abort plugin if specific signal received

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shadowsocks-rust"
-version = "1.6.0"
+version = "1.6.1"
 authors = ["Y. T. CHUNG <[email protected]>"]
 description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
 repository = "https://github.com/zonyitoo/shadowsocks-rust"
@@ -59,3 +59,6 @@ url = "1.5"
 [dependencies.sodiumoxide]
 version = "0.0.15"
 optional = true
+
+[target.'cfg(unix)'.dependencies]
+tokio-signal = "0.1"

src/lib.rs

@@ -101,6 +101,8 @@ extern crate lazy_static;
 extern crate scoped_tls;
 
 extern crate subprocess;
+#[cfg(unix)]
+extern crate tokio_signal;
 
 /// ShadowSocks version
 pub const VERSION: &'static str = env!("CARGO_PKG_VERSION");
@@ -114,3 +116,4 @@ pub mod config;
 pub mod relay;
 pub mod crypto;
 pub mod plugin;
+mod monitor;

src/monitor.rs

@@ -0,0 +1,40 @@
+use std::io;
+
+use libc;
+use tokio_core::reactor::Handle;
+
+use futures::{Future, Stream};
+
+#[cfg(unix)]
+pub fn monitor_signal(handle: &Handle) {
+    use tokio_signal::unix::Signal;
+
+    let fut = Signal::new(libc::SIGCHLD, handle)
+        .and_then(|signal| {
+                      signal.for_each(|_| -> Result<(), io::Error> {
+                                          panic!("Plugin exited unexpectly (SIGCHLD)");
+                                      })
+                  })
+        .map_err(|err| {
+                     error!("Failed to monitor SIGCHLD, err: {:?}", err);
+                 });
+
+    handle.spawn(fut);
+
+    let fut = Signal::new(libc::SIGTERM, handle)
+        .and_then(|sigterm| {
+                      sigterm.for_each(|_| -> Result<(), io::Error> {
+                                           panic!("Received SIGTERM, aborting process");
+                                       })
+                  })
+        .map_err(|err| {
+                     error!("Failed to monitor SIGTERM, SIGINT, err: {:?}", err);
+                 });
+
+    handle.spawn(fut);
+}
+
+#[cfg(not(unix))]
+pub fn monitor_signal(handle: &Handle) {
+    // FIXME: Do nothing ...
+}

src/plugin/mod.rs

@@ -53,6 +53,7 @@ impl Plugin {
 
 impl Drop for Plugin {
     fn drop(&mut self) {
+        debug!("Killing Plugin {:?}", self.process);
         let _ = self.process.terminate();
     }
 }

src/relay/local.rs

@@ -35,6 +35,7 @@ pub fn run(mut config: Config) -> io::Result<()> {
 
     // Hold it here, kill all plugins when Core is finished
     let _plugins = launch_plugin(&mut config, PluginMode::Client)?;
+    ::monitor::monitor_signal(&handle);
 
     let context = Context::new(handle, config);
     Context::set(&context, move || if enable_udp {

src/relay/server.rs

@@ -45,6 +45,7 @@ pub fn run(mut config: Config) -> io::Result<()> {
 
     // Hold it here, kill all plugins when Core is finished
     let _plugins = launch_plugin(&mut config, PluginMode::Server)?;
+    ::monitor::monitor_signal(&handle);
 
     let context = Context::new(handle, config);
     Context::set(&context, move || if enable_udp {