Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Polkadot CLI and logging initialization. #1

Merged
merged 2 commits into from
Nov 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
root = true
[*]
indent_style=tab
indent_size=tab
tab_width=4
end_of_line=lf
charset=utf-8
trim_trailing_whitespace=true
max_line_length=120
insert_final_newline=true

[*.yml]
indent_style=space
indent_size=2
tab_width=8
end_of_line=lf
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/target/
**/*.rs.bk
*.swp
234 changes: 234 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[package]
name = "polkadot"
version = "0.1.0"
authors = ["Robert Habermeier <rphmeier@gmail.com>"]
authors = ["Parity Team <admin@parity.io>"]

[dependencies]
polkadot-cli = { path = "cli" }

[workspace]
10 changes: 10 additions & 0 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[package]
name = "polkadot-cli"
version = "0.1.0"
authors = ["Parity Team <admin@parity.io>"]
description = "Polkadot node implementation in Rust."

[dependencies]
clap = { version = "2.27", features = ["yaml"] }
env_logger = "0.4"
log = "0.3"
15 changes: 15 additions & 0 deletions cli/src/cli.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: polkadot
version: "1.0.0"
author: "Parity Team <admin@polkadot.io>"
about: Polkadot Node Rust Implementation
args:
- log:
short: l
value_name: LOG_PATTERN
help: Sets a custom logging
takes_value: true
subcommands:
- collator:
Copy link
Contributor

Choose a reason for hiding this comment

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

polkadot --light --collating-for PARACHAIN_ID, and then collation process hooks into RPC

about: Run collator node
- validator:
about: Run validator node
61 changes: 61 additions & 0 deletions cli/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Copyright 2017 Parity Technologies (UK) Ltd.
// This file is part of Polkadot.

// Polkadot is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// Polkadot is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.

extern crate env_logger;

#[macro_use]
extern crate clap;
#[macro_use]
extern crate log;

pub fn main() {
let yaml = load_yaml!("./cli.yml");
let matches = clap::App::from_yaml(yaml).get_matches();

let log_pattern = matches.value_of("log").unwrap_or("");
init_logger(log_pattern);

if let Some(_) = matches.subcommand_matches("collator") {
info!("Starting collator.");
return;
}

if let Some(_) = matches.subcommand_matches("validator") {
info!("Starting validator.");
return;
}

println!("No command given.\n");
let _ = clap::App::from_yaml(yaml).print_long_help();
}


fn init_logger(pattern: &str) {
let mut builder = env_logger::LogBuilder::new();
// Disable info logging by default for some modules:
builder.filter(Some("hyper"), log::LogLevelFilter::Warn);
// Enable info for others.
builder.filter(None, log::LogLevelFilter::Info);

if let Ok(lvl) = std::env::var("RUST_LOG") {
builder.parse(&lvl);
}

builder.parse(pattern);


builder.init().expect("Logger initialized only once.");
}
6 changes: 4 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.

extern crate polkadot_cli;

fn main() {
println!("Hello, world!");
}
polkadot_cli::main();
}