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

Merge branch 'fixing-rpc' into webapps2

Browse Source 
Conflicts:
	parity/main.rs
This commit is contained in:
Tomasz Drwięga
2016-04-07 13:09:58 +02:00
parent 91f1f4c174 2adeb9fe88
commit db2354a252
8 changed files with 119 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
parity/main.rs
View File

@@ -45,6 +45,7 @@ extern crate ethcore_rpc as rpc;
#[cfg(feature = "webapp")]
extern crate ethcore_webapp as webapp;
use std::any::Any;
use std::io::{BufRead, BufReader};
use std::fs::File;
use std::net::{SocketAddr, IpAddr};
@@ -281,7 +282,7 @@ fn setup_rpc_server(
url: &str,
cors_domain: &str,
apis: Vec<&str>
) -> Arc<PanicHandler> {
) -> Box<Any> {
use rpc::v1::*;
let server = rpc::RpcServer::new();
@@ -299,8 +300,14 @@ fn setup_rpc_server(
}
}
}
server.start_http(url, cors_domain, ::num_cpus::get())
let start_result = server.start_http(url, cors_domain, ::num_cpus::get());
match start_result {
Err(rpc::RpcServerError::IoError(err)) => die_with_io_error(err),
Err(e) => die!("{:?}", e),
Ok(handle) => Box::new(handle),
}
}
#[cfg(feature = "webapp")]
fn setup_webapp_server(
client: Arc<Client>,
@@ -308,7 +315,7 @@ fn setup_webapp_server(
secret_store: Arc<AccountService>,
miner: Arc<Miner>,
url: &str
) -> Arc<PanicHandler> {
) -> Box<Any> {
use rpc::v1::*;
let server = webapp::WebappServer::new();
@@ -317,7 +324,13 @@ fn setup_webapp_server(
server.add_delegate(EthClient::new(&client, &sync, &secret_store, &miner).to_delegate());
server.add_delegate(EthFilterClient::new(&client, &miner).to_delegate());
server.add_delegate(PersonalClient::new(&secret_store).to_delegate());
server.start_http(url, ::num_cpus::get())
let start_result = server.start_http(url, ::num_cpus::get());
match start_result {
Err(webapp::WebappServerError::IoError(err)) => die_with_io_error(err),
Err(e) => die!("{:?}", e),
Ok(handle) => Box::new(handle),
}
}
#[cfg(not(feature = "rpc"))]
@@ -329,7 +342,7 @@ fn setup_rpc_server(
_url: &str,
_cors_domain: &str,
_apis: Vec<&str>
) -> Arc<PanicHandler> {
) -> ! {
die!("Your Parity version has been compiled without JSON-RPC support.")
}
@@ -340,7 +353,7 @@ fn setup_webapp_server(
_secret_store: Arc<AccountService>,
_miner: Arc<Miner>,
_url: &str
) -> Arc<PanicHandler> {
) -> ! {
die!("Your Parity version has been compiled without WebApps support.")
}
@@ -604,7 +617,10 @@ impl Configuration {
let account_service = Arc::new(self.account_service());
// Build client
let mut service = ClientService::start(self.client_config(), spec, net_settings, &Path::new(&self.path())).unwrap();
let mut service = ClientService::start(
self.client_config(), spec, net_settings, &Path::new(&self.path())
).unwrap_or_else(|e| die_with_error(e));
panic_handler.forward_from(&service);
let client = service.client();
@@ -619,7 +635,8 @@ impl Configuration {
let sync = EthSync::register(service.network(), sync_config, client.clone(), miner.clone());
// Setup rpc
if self.args.flag_jsonrpc || self.args.flag_rpc {
let rpc_server = if self.args.flag_jsonrpc || self.args.flag_rpc {
let apis = self.args.flag_rpcapi.as_ref().unwrap_or(&self.args.flag_jsonrpc_apis);
let url = format!("{}:{}",
match self.args.flag_rpcaddr.as_ref().unwrap_or(&self.args.flag_jsonrpc_interface).as_str() {
"all" => "0.0.0.0",
@@ -629,32 +646,33 @@ impl Configuration {
self.args.flag_rpcport.unwrap_or(self.args.flag_jsonrpc_port)
);
SocketAddr::from_str(&url).unwrap_or_else(|_| die!("{}: Invalid JSONRPC listen host/port given.", url));
let cors = self.args.flag_rpccorsdomain.as_ref().unwrap_or(&self.args.flag_jsonrpc_cors);
// TODO: use this as the API list.
let apis = self.args.flag_rpcapi.as_ref().unwrap_or(&self.args.flag_jsonrpc_apis);
let handler = setup_rpc_server(
service.client(),
sync.clone(),
account_service.clone(),
miner.clone(),
&url,
cors,
apis.split(',').collect()
);
panic_handler.forward_from(handler.deref());
}
let cors_domain = self.args.flag_rpccorsdomain.as_ref().unwrap_or(&self.args.flag_jsonrpc_cors);
if self.args.flag_webapp {
let url = format!("127.0.0.1:{}", self.args.flag_webapp_port);
let handler = setup_webapp_server(
Some(setup_rpc_server(
service.client(),
sync.clone(),
account_service.clone(),
miner.clone(),
&url,
);
panic_handler.forward_from(handler.deref());
}
&cors_domain,
apis.split(',').collect()
))
} else {
None
};
let webapp_server = if self.args.flag_webapp {
let url = format!("127.0.0.1:{}", self.args.flag_webapp_port);
Some(setup_webapp_server(
service.client(),
sync.clone(),
account_service.clone(),
miner.clone(),
&url,
))
} else {
None
};
// Register IO handler
let io_handler = Arc::new(ClientIoHandler {
@@ -666,11 +684,11 @@ impl Configuration {
service.io().register_handler(io_handler).expect("Error registering IO handler");
// Handle exit
wait_for_exit(panic_handler);
wait_for_exit(panic_handler, rpc_server, webapp_server);
}
}
fn wait_for_exit(panic_handler: Arc<PanicHandler>) {
fn wait_for_exit(panic_handler: Arc<PanicHandler>, _rpc_server: Option<Box<Any>>, _webapp_server: Option<Box<Any>>) {
let exit = Arc::new(Condvar::new());
// Handle possible exits
@@ -684,6 +702,30 @@ fn wait_for_exit(panic_handler: Arc<PanicHandler>) {
// Wait for signal
let mutex = Mutex::new(());
let _ = exit.wait(mutex.lock().unwrap()).unwrap();
info!("Finishing work, please wait...");
}
fn die_with_error(e: ethcore::error::Error) -> ! {
use ethcore::error::Error;
match e {
Error::Util(UtilError::StdIo(e)) => die_with_io_error(e),
_ => die!("{:?}", e),
}
}
fn die_with_io_error(e: std::io::Error) -> ! {
match e.kind() {
std::io::ErrorKind::PermissionDenied => {
die!("No permissions to bind to specified port.")
},
std::io::ErrorKind::AddrInUse => {
die!("Specified address is already in use. Please make sure that nothing is listening on the same port or try using a different one.")
},
std::io::ErrorKind::AddrNotAvailable => {
die!("Could not use specified interface or given address is invalid.")
},
_ => die!("{:?}", e),
}
}
fn main() {