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

Companion PR for #6564 #1350

Merged
merged 4 commits into from
Jul 8, 2020
Merged

Companion PR for #6564 #1350

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47ff7a6
Add log_rotation_opt
Jul 3, 2020
3633d06
Merge branch 'master' of github.com:paritytech/polkadot into scott_lo…
Jul 8, 2020
2765b57
Update Cargo lock
Jul 8, 2020
29edbee
Use SubstrateCli's log-directory instead of re-defining it
Jul 8, 2020
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
6 changes: 4 additions & 2 deletions cli/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
//! Polkadot CLI library.

use structopt::StructOpt;
use sc_cli::LogRotationOpt;

#[allow(missing_docs)]
#[derive(Debug, StructOpt)]
Expand Down Expand Up @@ -84,11 +85,12 @@ pub struct RunCmd {
#[allow(missing_docs)]
#[derive(Debug, StructOpt)]
pub struct Cli {
#[allow(missing_docs)]
#[structopt(subcommand)]
pub subcommand: Option<Subcommand>,

#[allow(missing_docs)]
#[structopt(flatten)]
pub run: RunCmd,

#[structopt(flatten)]
pub log_rotation_opt: LogRotationOpt,
}
2 changes: 1 addition & 1 deletion cli/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ pub fn run() -> Result<()> {
}
},
Some(Subcommand::ValidationWorker(cmd)) => {
sc_cli::init_logger("");
sc_cli::init_logger("", &cli.log_rotation_opt)?;

if cfg!(feature = "browser") {
Err(sc_cli::Error::Input("Cannot run validation worker in browser".into()))
Expand Down