Skip to content

Parse toml config file for reading configurations #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 11, 2019
Merged

Parse toml config file for reading configurations #83

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52a5571
Refactor port/ipc parsing functions
remagpie Dec 10, 2019
9b665b2
Parse toml config file for ipc path and port number
remagpie Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions client/src/process/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,22 +619,24 @@ fn get_commit_hash(option: &ProcessOption, codechain_status: &CodeChainStatus) -
}

fn parse_flags(args: &[String]) -> (u16, String) {
let p2p_port = parse_port(args, "--port");
let ipc_path = parse_path(args, "--ipc-path");
let p2p_port = parse_port(args);
let ipc_path = parse_path(args);

(p2p_port.unwrap_or(3485), ipc_path.unwrap_or_else(|| "/tmp/jsonrpc.ipc".to_string()))
}

fn parse_port(args: &[String], option_name: &str) -> Option<u16> {
let option_position = args.iter().position(|arg| arg == option_name);
let interface_pos = option_position.map(|pos| pos + 1);
let interface_string = interface_pos.and_then(|pos| args.get(pos));
interface_string.and_then(|port| port.parse().ok())
fn parse_port(args: &[String]) -> Option<u16> {
if let Some(position) = args.iter().position(|arg| arg == "--port") {
args.get(position + 1)?.parse().ok()
} else {
None
}
Copy link
Contributor

@majecty majecty Dec 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good! It's better to read.

}

fn parse_path(args: &[String], option_name: &str) -> Option<String> {
let option_position = args.iter().position(|arg| arg == option_name);
let interface_pos = option_position.map(|pos| pos + 1);
let interface_string = interface_pos.and_then(|pos| args.get(pos));
interface_string.cloned()
fn parse_path(args: &[String]) -> Option<String> {
if let Some(position) = args.iter().position(|arg| arg == "--ipc-path") {
args.get(position + 1).cloned()
} else {
None
}
}