From b11ec7ea9f008a8758526d65aa4e9754ac9032a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 23 Nov 2020 00:08:52 +0100 Subject: [PATCH] Bring back log prefixing (#245) --- cumulus/Cargo.lock | 1 + cumulus/rococo-parachains/src/service.rs | 1 + cumulus/service/Cargo.toml | 1 + cumulus/service/src/lib.rs | 1 + 4 files changed, 4 insertions(+) diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock index 929af68f13..958ae7b816 100644 --- a/cumulus/Cargo.lock +++ b/cumulus/Cargo.lock @@ -1218,6 +1218,7 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "polkadot-service", + "sc-cli", "sc-client-api", "sc-service", "sp-api", diff --git a/cumulus/rococo-parachains/src/service.rs b/cumulus/rococo-parachains/src/service.rs index 9a5602ff47..9dccc095c5 100644 --- a/cumulus/rococo-parachains/src/service.rs +++ b/cumulus/rococo-parachains/src/service.rs @@ -94,6 +94,7 @@ pub fn new_partial( /// Start a node with the given parachain `Configuration` and relay chain `Configuration`. /// /// This is the actual implementation that is abstract over the executor and the runtime api. +#[sc_cli::prefix_logs_with("Parachain")] async fn start_node_impl( parachain_config: Configuration, collator_key: CollatorPair, diff --git a/cumulus/service/Cargo.toml b/cumulus/service/Cargo.toml index 174be9ad4c..fe27627ec9 100644 --- a/cumulus/service/Cargo.toml +++ b/cumulus/service/Cargo.toml @@ -13,6 +13,7 @@ cumulus-primitives = { path = "../primitives" } # Substrate dependencies sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/cumulus/service/src/lib.rs b/cumulus/service/src/lib.rs index ff05137370..44d51d91a7 100644 --- a/cumulus/service/src/lib.rs +++ b/cumulus/service/src/lib.rs @@ -292,6 +292,7 @@ pub fn prepare_node_config(mut parachain_config: Configuration) -> Configuration } /// Build the Polkadot full node using the given `config`. +#[sc_cli::prefix_logs_with("Relaychain")] pub fn build_polkadot_full_node( config: Configuration, collator_id: CollatorId,