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

Fixing detecting if dapps are off

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-06-24 12:14:46 +02:00
parent 23732fa516
commit 566bb030ec
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parity/configuration.rs
View File

@ -454,6 +454,10 @@ impl Configuration {
x => x, x => x,
}.into() }.into()
} }
pub fn dapps_enabled(&self) -> bool {
!self.args.flag_dapps_off && !self.args.flag_no_dapps
}
} }
#[cfg(test)] #[cfg(test)]

4
parity/main.rs
View File

@ -264,7 +264,7 @@ fn execute_client(conf: Configuration, spec: Spec, client_config: ClientConfig)
if conf.args.flag_webapp { println!("WARNING: Flag -w/--webapp is deprecated. Dapps server is now on by default. Ignoring."); } if conf.args.flag_webapp { println!("WARNING: Flag -w/--webapp is deprecated. Dapps server is now on by default. Ignoring."); }
let dapps_server = dapps::new(dapps::Configuration { let dapps_server = dapps::new(dapps::Configuration {
enabled: !conf.args.flag_dapps_off && !conf.args.flag_no_dapps, enabled: conf.dapps_enabled(),
interface: conf.dapps_interface(), interface: conf.dapps_interface(),
port: conf.args.flag_dapps_port, port: conf.args.flag_dapps_port,
user: conf.args.flag_dapps_user.clone(), user: conf.args.flag_dapps_user.clone(),
@ -296,7 +296,7 @@ fn execute_client(conf: Configuration, spec: Spec, client_config: ClientConfig)
service.register_io_handler(io_handler).expect("Error registering IO handler"); service.register_io_handler(io_handler).expect("Error registering IO handler");
if conf.args.cmd_ui { if conf.args.cmd_ui {
if conf.args.flag_dapps_off { if !conf.dapps_enabled() {
die_with_message("Cannot use UI command with Dapps turned off."); die_with_message("Cannot use UI command with Dapps turned off.");
} }
url::open(&format!("http://{}:{}/", conf.dapps_interface(), conf.args.flag_dapps_port)); url::open(&format!("http://{}:{}/", conf.dapps_interface(), conf.args.flag_dapps_port));

2
parity/url.rs
View File

@ -55,5 +55,5 @@ pub fn open(url: &str) {
#[cfg(target_os="linux")] #[cfg(target_os="linux")]
pub fn open(url: &str) { pub fn open(url: &str) {
use std; use std;
let _ = std::process::Command::new("xdg-open").arg(url).output(); let _ = std::process::Command::new("xdg-open").arg(url).spawn();
} }