grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing additional thread from JSON-RPC

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-04-06 19:14:05 +02:00
parent 1f9eb97d0a
commit a52043d5b3
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parity/main.rs
View File

@ -594,10 +594,8 @@ impl Configuration {
} else { } else {
None None
}; };
let rpc_handle = rpc_server.map(|server| { let rpc_handle = rpc_server.map(|server| {
panic_handler.forward_from(&server);
server
}).map(|server| {
let url = format!("{}:{}", let url = format!("{}:{}",
match self.args.flag_rpcaddr.as_ref().unwrap_or(&self.args.flag_jsonrpc_interface).as_str() { match self.args.flag_rpcaddr.as_ref().unwrap_or(&self.args.flag_jsonrpc_interface).as_str() {
"all" => "0.0.0.0", "all" => "0.0.0.0",

18
rpc/src/lib.rs
View File

@ -33,8 +33,6 @@ extern crate ethminer;
extern crate transient_hashmap; extern crate transient_hashmap;
use std::sync::Arc; use std::sync::Arc;
use std::thread;
use util::panics::{MayPanic, PanicHandler, OnPanicListener};
use self::jsonrpc_core::{IoHandler, IoDelegate}; use self::jsonrpc_core::{IoHandler, IoDelegate};
pub use jsonrpc_http_server::{Listening, RpcServerError}; pub use jsonrpc_http_server::{Listening, RpcServerError};
@ -43,7 +41,6 @@ pub mod v1;
/// Http server. /// Http server.
pub struct RpcServer { pub struct RpcServer {
handler: Arc<IoHandler>, handler: Arc<IoHandler>,
panic_handler: Arc<PanicHandler>
} }
impl RpcServer { impl RpcServer {
@ -51,7 +48,6 @@ impl RpcServer {
pub fn new() -> RpcServer { pub fn new() -> RpcServer {
RpcServer { RpcServer {
handler: Arc::new(IoHandler::new()), handler: Arc::new(IoHandler::new()),
panic_handler: PanicHandler::new_in_arc(),
} }
} }
@ -64,20 +60,8 @@ impl RpcServer {
pub fn start_http(&self, addr: &str, cors_domain: &str, threads: usize) -> Result<Listening, RpcServerError> { pub fn start_http(&self, addr: &str, cors_domain: &str, threads: usize) -> Result<Listening, RpcServerError> {
let addr = addr.to_owned(); let addr = addr.to_owned();
let cors_domain = cors_domain.to_owned(); let cors_domain = cors_domain.to_owned();
let ph = self.panic_handler.clone();
let server = jsonrpc_http_server::Server::new(self.handler.clone()); let server = jsonrpc_http_server::Server::new(self.handler.clone());
thread::Builder::new().name("jsonrpc_http".to_string()).spawn(move || { server.start(addr.as_ref(), jsonrpc_http_server::AccessControlAllowOrigin::Value(cors_domain), threads)
ph.catch_panic(move || {
server.start(addr.as_ref(), jsonrpc_http_server::AccessControlAllowOrigin::Value(cors_domain), threads)
}).unwrap()
}).expect("Error while creating jsonrpc http thread").join().unwrap()
} }
} }
impl MayPanic for RpcServer {
fn on_panic<F>(&self, closure: F) where F: OnPanicListener {
self.panic_handler.on_panic(closure);
}
}