Merge pull request #27 from ami44/master

move examples/websocket.rs to examples/websocket

.travis.yml

@@ -46,6 +46,7 @@ script:
        cd examples/diesel && cargo check && cd ../..
        cd examples/tls && cargo check && cd ../..
        cd examples/websocket-chat && cargo check && cd ../..
+       cd examples/websocket && cargo check && cd ../..
     fi
   - |
     if [[ "$TRAVIS_RUST_VERSION" == "nightly" && $CLIPPY ]]; then

README.md

@@ -50,7 +50,7 @@ Some basic benchmarks could be found in this [respository](https://github.com/fa
 * [Basic](https://github.com/actix/actix-web/tree/master/examples/basic/)
 * [Stateful](https://github.com/actix/actix-web/tree/master/examples/state/)
 * [Mulitpart streams](https://github.com/actix/actix-web/tree/master/examples/multipart/)
-* [Simple websocket session](https://github.com/actix/actix-web/tree/master/examples/websocket.rs)
+* [Simple websocket session](https://github.com/actix/actix-web/tree/master/examples/websocket/)
 * [Tera templates](https://github.com/actix/actix-web/tree/master/examples/template_tera/)
 * [Diesel integration](https://github.com/actix/actix-web/tree/master/examples/diesel/)
 * [SSL / HTTP/2.0](https://github.com/actix/actix-web/tree/master/examples/tls/)

examples/diesel/Cargo.toml

@@ -6,8 +6,8 @@ workspace = "../.."
 
 [dependencies]
 env_logger = "0.4"
-actix = "^0.3.1"
+actix = "^0.3.5"
-actix-web = { git = "https://github.com/actix/actix-web.git" }
+actix-web = { git = "https://github.com/actix/actix-web", features=["signal"] }
 
 futures = "0.1"
 uuid = { version = "0.5", features = ["serde", "v4"] }

examples/diesel/README.md

@@ -4,17 +4,40 @@ Diesel's `Getting Started` guide using SQLite for Actix web
 
 ## Usage
 
-install `diesel_cli`
+### init database sqlite
 
 ```bash
 cargo install diesel_cli --no-default-features --features sqlite
-```
+cd actix-web/examples/diesel
-
-```bash
 echo "DATABASE_URL=file:test.db" > .env
 diesel migration run
 ```
 
+### server
+
+```bash
+# if ubuntu : sudo apt-get install libsqlite3-dev
+# if fedora : sudo dnf install libsqlite3x-devel
+cd actix-web/examples/diesel
+cargo run (or ``cargo watch -x run``)
+# Started http server: 127.0.0.1:8080
+```
+
+### web client
+
+[http://127.0.0.1:8080/NAME](http://127.0.0.1:8080/NAME)
+
+### sqlite client
+
+```bash
+# if ubuntu : sudo apt-get install sqlite3
+# if fedora : sudo dnf install sqlite3x
+sqlite3 test.db
+sqlite> .tables
+sqlite> select * from users;
+```
+
+
 ## Postgresql
 
 You will also find another complete example of diesel+postgresql on      [https://github.com/TechEmpower/FrameworkBenchmarks/tree/master/frameworks/Rust/actix](https://github.com/TechEmpower/FrameworkBenchmarks/tree/master/frameworks/Rust/actix)

examples/diesel/src/main.rs

@@ -16,8 +16,11 @@ extern crate actix;
 extern crate actix_web;
 extern crate env_logger;
 
+use actix::*;
 use actix_web::*;
 use actix::prelude::*;
+#[cfg(target_os = "linux")] use actix::actors::signal::{ProcessSignals, Subscribe};
+
 use diesel::prelude::*;
 use futures::future::Future;
 
@@ -59,7 +62,7 @@ fn main() {
     });
 
     // Start http server
-    HttpServer::new(move || {
+    let _addr = HttpServer::new(move || {
         Application::with_state(State{db: addr.clone()})
             // enable logger
             .middleware(middleware::Logger::default())
@@ -67,6 +70,11 @@ fn main() {
         .bind("127.0.0.1:8080").unwrap()
         .start();
 
+    if cfg!(target_os = "linux") { // Subscribe to unix signals
+        let signals = Arbiter::system_registry().get::<ProcessSignals>();
+        signals.send(Subscribe(_addr.subscriber()));
+    }
+
     println!("Started http server: 127.0.0.1:8080");
     let _ = sys.run();
 }

examples/websocket/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "websocket"
+version = "0.1.0"
+authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
+
+[[bin]]
+name = "server"
+path = "src/main.rs"
+
+[dependencies]
+env_logger = "*"
+futures = "0.1"
+actix = "^0.3.5"
+actix-web = { git = "https://github.com/actix/actix-web.git", features=["signal"] }

examples/websocket/README.md

@@ -0,0 +1,27 @@
+# websockect
+
+Simple echo websocket server.
+
+## Usage
+
+### server
+
+```bash
+cd actix-web/examples/websocket
+cargo run
+# Started http server: 127.0.0.1:8080
+```
+
+### web client
+
+- [http://localhost:8080/ws/index.html](http://localhost:8080/ws/index.html)
+
+### python client
+
+- ``pip install aiohttp``
+- ``python websocket-client.py``
+
+if ubuntu :
+
+- ``pip3 install aiohttp``
+- ``python3 websocket-client.py``

examples/websocket/src/main.rs

@@ -10,7 +10,7 @@ extern crate env_logger;
 
 use actix::*;
 use actix_web::*;
-
+#[cfg(target_os = "linux")] use actix::actors::signal::{ProcessSignals, Subscribe};
 
 /// do websocket handshake and start `MyWebSocket` actor
 fn ws_index(r: HttpRequest) -> Result<HttpResponse, Error> {
@@ -60,7 +60,7 @@ fn main() {
     let _ = env_logger::init();
     let sys = actix::System::new("ws-example");
 
-    HttpServer::new(
+    let _addr = HttpServer::new(
         || Application::new()
             // enable logger
             .middleware(middleware::Logger::default())
@@ -68,11 +68,16 @@ fn main() {
             .resource("/ws/", |r| r.method(Method::GET).f(ws_index))
             // static files
             .resource("/{tail:.*}",
-                      |r| r.h(fs::StaticFiles::new("tail", "examples/static/", true))))
+                      |r| r.h(fs::StaticFiles::new("tail", "../static/", true))))
         // start http server on 127.0.0.1:8080
         .bind("127.0.0.1:8080").unwrap()
         .start();
 
+    if cfg!(target_os = "linux") { // Subscribe to unix signals
+        let signals = Arbiter::system_registry().get::<ProcessSignals>();
+        signals.send(Subscribe(_addr.subscriber()));
+    }
+
     println!("Started http server: 127.0.0.1:8080");
     let _ = sys.run();
 }