From 115e82329fe47f3aad5c3b946c01821bf849f90d Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Mon, 14 Oct 2019 11:19:08 +0600
Subject: [PATCH] fix arbiter thread panic message

---
 actix-rt/CHANGES.md     | 7 +++++++
 actix-rt/src/arbiter.rs | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/actix-rt/CHANGES.md b/actix-rt/CHANGES.md
index c82a0d07..98f6a601 100644
--- a/actix-rt/CHANGES.md
+++ b/actix-rt/CHANGES.md
@@ -1,5 +1,12 @@
 # Changes
 
+## [0.2.6] - Unreleased
+
+### Fixed
+
+* Fix arbiter's thread panic message.
+
+
 ## [0.2.5] - 2019-09-02
 
 ### Added
diff --git a/actix-rt/src/arbiter.rs b/actix-rt/src/arbiter.rs
index 285ad3c9..083105b3 100644
--- a/actix-rt/src/arbiter.rs
+++ b/actix-rt/src/arbiter.rs
@@ -260,9 +260,11 @@ struct ArbiterController {
 impl Drop for ArbiterController {
     fn drop(&mut self) {
         if thread::panicking() {
-            eprintln!("Panic in Arbiter thread, shutting down system.");
             if System::current().stop_on_panic() {
+                eprintln!("Panic in Arbiter thread, shutting down system.");
                 System::current().stop_with_code(1)
+            } else {
+                eprintln!("Panic in Arbiter thread.");
             }
         }
     }