subscriber to os signals automatically

examples/basics/src/main.rs

@@ -10,7 +10,7 @@ use futures::Stream;
 use actix_web::*;
 use actix_web::middleware::RequestSession;
 use futures::future::{FutureResult, result};
-use actix::actors::signal::{ProcessSignals, Subscribe};
+
 
 /// simple handler
 fn index(mut req: HttpRequest) -> Result<HttpResponse> {
@@ -94,10 +94,6 @@ fn main() {
         .bind("0.0.0.0:8080").unwrap()
         .start();
 
-    // Subscribe to unix signals
-    let signals = actix::Arbiter::system_registry().get::<ProcessSignals>();
-    signals.send(Subscribe(addr.subscriber()));
-
     println!("Starting http server: 127.0.0.1:8080");
     let _ = sys.run();
 }

examples/diesel/src/main.rs

@@ -18,7 +18,6 @@ extern crate env_logger;
 
 use actix::*;
 use actix_web::*;
-use actix::actors::signal::{ProcessSignals, Subscribe};
 
 use diesel::prelude::*;
 use futures::future::Future;
@@ -69,10 +68,6 @@ fn main() {
         .bind("127.0.0.1:8080").unwrap()
         .start();
 
-    // Subscribe to unix signals
-    let signals = actix::Arbiter::system_registry().get::<ProcessSignals>();
-    signals.send(Subscribe(_addr.subscriber()));
-
     println!("Started http server: 127.0.0.1:8080");
     let _ = sys.run();
 }

examples/json/src/main.rs

@@ -8,7 +8,6 @@ extern crate serde_json;
 #[macro_use] extern crate json;
 
 use actix_web::*;
-use actix::actors::signal::{ProcessSignals, Subscribe};
 
 use bytes::BytesMut;
 use futures::{Future, Stream};
@@ -95,10 +94,6 @@ fn main() {
         .shutdown_timeout(1)
         .start();
 
-    // Subscribe to unix signals
-    let signals = actix::Arbiter::system_registry().get::<ProcessSignals>();
-    signals.send(Subscribe(addr.subscriber()));
-
     println!("Started http server: 127.0.0.1:8080");
     let _ = sys.run();
 }

examples/multipart/src/main.rs

@@ -6,7 +6,6 @@ extern crate futures;
 
 use actix::*;
 use actix_web::*;
-use actix::actors::signal::{ProcessSignals, Subscribe};
 
 use futures::{Future, Stream};
 use futures::future::{result, Either};
@@ -55,10 +54,6 @@ fn main() {
         .bind("127.0.0.1:8080").unwrap()
         .start();
 
-    // Subscribe to unix signals
-    let signals = actix::Arbiter::system_registry().get::<ProcessSignals>();
-    signals.send(Subscribe(addr.subscriber()));
-
     println!("Starting http server: 127.0.0.1:8080");
     let _ = sys.run();
 }

examples/signals/Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name = "signals"
-version = "0.1.0"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-workspace = "../.."
-
-[[bin]]
-name = "server"
-path = "src/main.rs"
-
-[dependencies]
-env_logger = "*"
-futures = "0.1"
-actix = "0.4"
-actix-web = { path = "../../" }

examples/signals/README.md

@@ -1,17 +0,0 @@
-# Signals
-
-This example shows how to handle Unix signals and properly stop http server. This example does not work with Windows.
-
-## Usage
-
-```bash
-cd actix-web/examples/signal
-cargo run (or ``cargo watch -x run``)
-# Started http server: 127.0.0.1:8080
-# CTRL+C
-# INFO:actix_web::server: SIGINT received, exiting
-# INFO:actix_web::worker: Shutting down http worker, 0 connections
-# INFO:actix_web::worker: Shutting down http worker, 0 connections
-# INFO:actix_web::worker: Shutting down http worker, 0 connections
-# INFO:actix_web::worker: Shutting down http worker, 0 connections
-```

examples/signals/src/main.rs

@@ -1,45 +0,0 @@
-extern crate actix;
-extern crate actix_web;
-extern crate futures;
-extern crate env_logger;
-
-use actix::*;
-use actix_web::*;
-use actix::actors::signal::{ProcessSignals, Subscribe};
-
-struct MyWebSocket;
-
-impl Actor for MyWebSocket {
-    type Context = HttpContext<Self>;
-}
-
-impl StreamHandler<ws::Message> for MyWebSocket {}
-impl Handler<ws::Message> for MyWebSocket {
-    type Result = ();
-
-    fn handle(&mut self, _: ws::Message, _: &mut Self::Context) {
-        {}
-    }
-}
-
-fn main() {
-    ::std::env::set_var("RUST_LOG", "actix_web=info");
-    let _ = env_logger::init();
-    let sys = actix::System::new("signals-example");
-
-    let addr = HttpServer::new(|| {
-        Application::new()
-            // enable logger
-            .middleware(middleware::Logger::default())
-            .resource("/ws/", |r| r.f(|req| ws::start(req, MyWebSocket)))
-            .resource("/", |r| r.h(httpcodes::HTTPOk))})
-        .bind("127.0.0.1:8080").unwrap()
-        .start();
-
-    // Subscribe to unix signals
-    let signals = actix::Arbiter::system_registry().get::<ProcessSignals>();
-    signals.send(Subscribe(addr.subscriber()));
-
-    println!("Started http server: 127.0.0.1:8080");
-    let _ = sys.run();
-}

examples/state/src/main.rs

@@ -11,7 +11,6 @@ use std::cell::Cell;
 
 use actix::*;
 use actix_web::*;
-use actix::actors::signal::{ProcessSignals, Subscribe};
 
 /// Application state
 struct AppState {
@@ -74,10 +73,6 @@ fn main() {
         .bind("127.0.0.1:8080").unwrap()
         .start();
 
-    // Subscribe to unix signals
-    let signals = actix::Arbiter::system_registry().get::<ProcessSignals>();
-    signals.send(Subscribe(addr.subscriber()));
-
     println!("Started http server: 127.0.0.1:8080");
     let _ = sys.run();
 }

examples/template_tera/src/main.rs

@@ -5,7 +5,6 @@ extern crate env_logger;
 extern crate tera;
 
 use actix_web::*;
-use actix::actors::signal::{ProcessSignals, Subscribe};
 
 
 struct State {
@@ -43,10 +42,6 @@ fn main() {
         .bind("127.0.0.1:8080").unwrap()
         .start();
 
-    // Subscribe to unix signals
-    let signals = actix::Arbiter::system_registry().get::<ProcessSignals>();
-    signals.send(Subscribe(addr.subscriber()));
-
     println!("Started http server: 127.0.0.1:8080");
     let _ = sys.run();
 }

examples/tls/src/main.rs

@@ -7,7 +7,7 @@ use std::fs::File;
 use std::io::Read;
 
 use actix_web::*;
-use actix::actors::signal::{ProcessSignals, Subscribe};
+
 
 /// somple handle
 fn index(req: HttpRequest) -> Result<HttpResponse> {
@@ -46,10 +46,6 @@ fn main() {
         .bind("127.0.0.1:8443").unwrap()
         .start_ssl(&pkcs12).unwrap();
 
-    // Subscribe to unix signals
-    let signals = actix::Arbiter::system_registry().get::<ProcessSignals>();
-    signals.send(Subscribe(addr.subscriber()));
-
     println!("Started http server: 127.0.0.1:8443");
     let _ = sys.run();
 }

examples/websocket-chat/src/main.rs

@@ -18,7 +18,6 @@ use std::time::Instant;
 
 use actix::*;
 use actix_web::*;
-use actix::actors::signal::{ProcessSignals, Subscribe};
 
 mod codec;
 mod server;
@@ -213,10 +212,6 @@ fn main() {
         .bind("127.0.0.1:8080").unwrap()
         .start();
 
-    // Subscribe to unix signals
-    let signals = actix::Arbiter::system_registry().get::<ProcessSignals>();
-    signals.send(Subscribe(addr.subscriber()));
-
     println!("Started http server: 127.0.0.1:8080");
     let _ = sys.run();
 }

examples/websocket/src/main.rs

@@ -10,7 +10,6 @@ extern crate env_logger;
 
 use actix::*;
 use actix_web::*;
-use actix::actors::signal::{ProcessSignals, Subscribe};
 
 /// do websocket handshake and start `MyWebSocket` actor
 fn ws_index(r: HttpRequest) -> Result<HttpResponse> {
@@ -71,10 +70,6 @@ fn main() {
         .bind("127.0.0.1:8080").unwrap()
         .start();
 
-    // Subscribe to unix signals
-    let signals = actix::Arbiter::system_registry().get::<ProcessSignals>();
-    signals.send(Subscribe(_addr.subscriber()));
-
     println!("Started http server: 127.0.0.1:8080");
     let _ = sys.run();
 }