CHANGELOG and some clarification

holochain · Jul 19, 2019 · 59c4912 · 59c4912
1 parent e2f4699
commit 59c4912
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG-UNRELEASED.md b/CHANGELOG-UNRELEASED.md
@@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Added
 - **BREAKING:** Zomes must now include a `validate_agent` callback. If this rejects in any zome the DNA will not start. This can be used to enforce membrane requirements. [#1497](https://github.com/holochain/holochain-rust/pull/1497)
 - Added a `get_links_count` method which allows the user to get number of links by base and tag [#1568](https://github.com/holochain/holochain-rust/pull/1568)### Changed
+- The Conductor will shut down gracefully when receiving SIGINT (i.e. Ctrl+C) or SIGKILL, also causing a graceful shutdown of an attached n3h instance, if running [#1599](https://github.com/holochain/holochain-rust/pull/1599)
 
 ### Deprecated
 

diff --git a/conductor/src/main.rs b/conductor/src/main.rs
@@ -78,7 +78,7 @@ fn main() {
                     println!("Gracefully shutting down conductor...");
                 } else {
                     println!(
-                        "Explicitly shutting down conductor. {} other threads are referencing it.",
+                        "Explicitly shutting down conductor. {} other threads were referencing it, so if unwrap errors follow, that might be why.",
                         refs - 1
                     );
                     conductor

diff --git a/conductor_api/src/conductor/base.rs b/conductor_api/src/conductor/base.rs
@@ -450,7 +450,7 @@ impl Conductor {
 
     /// Stop and clear all instances
     pub fn shutdown(&mut self) -> Result<(), HolochainInstanceError> {
-        let _ = self.stop_all_instances()?;
+        self.stop_all_instances()?;
         self.stop_all_interfaces();
         self.signal_multiplexer_kill_switch
             .as_ref()