From 7c2b54c5e7efb6de63d431be4bd718c7d63495ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Fri, 23 Apr 2021 22:00:07 +0200
Subject: [PATCH] Make sure that relayers have dates in logs. (#927)

---
 bridges/relays/bin-substrate/src/cli/mod.rs | 15 +++++++++++++++
 bridges/relays/bin-substrate/src/main.rs    |  3 ---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bridges/relays/bin-substrate/src/cli/mod.rs b/bridges/relays/bin-substrate/src/cli/mod.rs
index 505ef11ee2..341051de5c 100644
--- a/bridges/relays/bin-substrate/src/cli/mod.rs
+++ b/bridges/relays/bin-substrate/src/cli/mod.rs
@@ -89,8 +89,23 @@ pub enum Command {
 }
 
 impl Command {
+	// Initialize logger depending on the command.
+	fn init_logger(&self) {
+		use relay_utils::initialize::{initialize_logger, initialize_relay};
+
+		match self {
+			Self::RelayHeaders(_) | Self::RelayMessages(_) | Self::RelayHeadersAndMessages(_) | Self::InitBridge(_) => {
+				initialize_relay();
+			}
+			_ => {
+				initialize_logger(false);
+			}
+		}
+	}
+
 	/// Run the command.
 	pub async fn run(self) -> anyhow::Result<()> {
+		self.init_logger();
 		match self {
 			Self::RelayHeaders(arg) => arg.run().await?,
 			Self::RelayMessages(arg) => arg.run().await?,
diff --git a/bridges/relays/bin-substrate/src/main.rs b/bridges/relays/bin-substrate/src/main.rs
index 6bf7561fcd..d119042b0d 100644
--- a/bridges/relays/bin-substrate/src/main.rs
+++ b/bridges/relays/bin-substrate/src/main.rs
@@ -18,8 +18,6 @@
 
 #![warn(missing_docs)]
 
-use relay_utils::initialize::initialize_logger;
-
 mod chains;
 mod cli;
 mod finality_pipeline;
@@ -31,7 +29,6 @@ mod messages_target;
 mod on_demand_headers;
 
 fn main() {
-	initialize_logger(false);
 	let command = cli::parse_args();
 	let run = command.run();
 	let result = async_std::task::block_on(run);