gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add error catch for rpc server builder

Browse Source
This commit is contained in:
Tyera Eulberg
2018-08-21 13:43:48 -06:00
committed by Tyera Eulberg
parent be4824c955
commit a355d9f46c
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rpc.rs
View File

@ -8,7 +8,6 @@ use service::Service;
use signature::{Pubkey, Signature}; use signature::{Pubkey, Signature};
use std::mem; use std::mem;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::panic;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc; use std::sync::Arc;
use std::thread::{self, Builder, JoinHandle}; use std::thread::{self, Builder, JoinHandle};
@ -29,10 +28,6 @@ impl JsonRpcService {
let rpc = RpcSolImpl; let rpc = RpcSolImpl;
io.extend_with(rpc.to_delegate()); io.extend_with(rpc.to_delegate());
panic::set_hook(Box::new(move |_| {
warn!("JSON RPC service unavailable: unable to bind to RPC port {}. \nMake sure this port is not already in use by another application", rpc_addr.port());
}));
let server = let server =
ServerBuilder::with_meta_extractor(io, move |_req: &hyper::Request| Meta { ServerBuilder::with_meta_extractor(io, move |_req: &hyper::Request| Meta {
request_processor: request_processor.clone(), request_processor: request_processor.clone(),
@ -40,12 +35,14 @@ impl JsonRpcService {
.cors(DomainsValidation::AllowOnly(vec![ .cors(DomainsValidation::AllowOnly(vec![
AccessControlAllowOrigin::Any, AccessControlAllowOrigin::Any,
])) ]))
.start_http(&rpc_addr) .start_http(&rpc_addr);
.unwrap(); if server.is_err() {
let _ = panic::take_hook(); warn!("JSON RPC service unavailable: unable to bind to RPC port {}. \nMake sure this port is not already in use by another application", rpc_addr.port());
return;
}
loop { loop {
if exit.load(Ordering::Relaxed) { if exit.load(Ordering::Relaxed) {
server.close(); server.unwrap().close();
break; break;
} }
} }