Fix SIGINT force shutdown

actix · Mar 30, 2019 · 3add906 · 3add906
1 parent 02ab804
commit 3add906
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md
@@ -1,5 +1,12 @@
 # Changes
 
+## [0.4.2] - 2019-03-30
+
+### Fixed
+
+* Fix SIGINT force shutdown
+
+
 ## [0.4.1] - 2019-03-14
 
 ### Added

diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-server"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix server - General purpose tcp server"
 keywords = ["network", "framework", "async", "futures"]

diff --git a/actix-server/src/builder.rs b/actix-server/src/builder.rs
@@ -328,7 +328,7 @@ impl ServerBuilder {
                 self.accept.send(Command::Stop);
 
                 // stop workers
-                if !self.workers.is_empty() {
+                if !self.workers.is_empty() && graceful {
                     spawn(
                         futures_unordered(
                             self.workers