Graceful API shutdown

Author: vekamo

Cargo.lock

@@ -24,13 +24,15 @@ blake2-rfc = "0.2"
 chrono = "0.4.11"
 clap = { version = "2.33", features = ["yaml"] }
 ctrlc = { version = "3.1", features = ["termination"] }
+failure = "0.1"
+failure_derive = "0.1"
+futures = "0.3.19"
 humansize = "1.1.0"
+log = "0.4"
 serde = "1"
 serde_json = "1"
-log = "0.4"
 term = "0.6"
-failure = "0.1"
-failure_derive = "0.1"
+
 
 grin_api = { path = "./api", version = "4.4.2" }
 grin_config = { path = "./config", version = "4.4.2" }

Cargo.toml

@@ -59,12 +59,15 @@ use crate::stratum::Stratum;
 use crate::stratum_rpc::StratumRpc;
 use crate::util::to_base64;
 use crate::util::RwLock;
+use crate::util::StopState;
 use crate::web::*;
 use easy_jsonrpc_mw::{Handler, MaybeReply};
+use futures::channel::oneshot;
 use hyper::{Body, Request, Response, StatusCode};
 use serde::Serialize;
 use std::net::SocketAddr;
 use std::sync::{Arc, Weak};
+use std::thread;
 
 /// Listener version, providing same API but listening for requests on a
 /// port and wrapping the calls
@@ -79,6 +82,8 @@ pub fn node_apis<B, P, V>(
 	tls_config: Option<TLSConfig>,
 	allow_to_stop: bool,
 	stratum_ip_pool: Arc<stratum::connections::StratumIpPool>,
+	api_chan: &'static mut (oneshot::Sender<()>, oneshot::Receiver<()>),
+	stop_state: Arc<StopState>,
 ) -> Result<(), Error>
 where
 	B: BlockChain + 'static,
@@ -155,10 +160,24 @@ where
 	let mut apis = ApiServer::new();
 	warn!("Starting HTTP Node APIs server at {}.", addr);
 	let socket_addr: SocketAddr = addr.parse().expect("unable to parse socket address");
-	let api_thread = apis.start(socket_addr, router, tls_config);
+	let api_thread = apis.start(socket_addr, router, tls_config, api_chan);
 
 	warn!("HTTP Node listener started.");
 
+	thread::Builder::new()
+		.name("api_monitor".to_string())
+		.spawn(move || {
+			// monitor for stop state is_stopped
+			loop {
+				std::thread::sleep(std::time::Duration::from_millis(100));
+				if stop_state.is_stopped() {
+					apis.stop();
+					break;
+				}
+			}
+		})
+		.ok();
+
 	match api_thread {
 		Ok(_) => Ok(()),
 		Err(e) => {