JSON-aware output in conclude.rs

ci/simple_config.toml

@@ -2,7 +2,6 @@
 timeout = '10s'
 strategy = 'naive'
 log_level = 'info'
-log_json = false
 
 [[chains]]
 id = 'ibc-0'

config.toml

@@ -2,7 +2,6 @@
 timeout = '10s'
 strategy = 'naive'
 log_level = 'error'
-log_json = false
 
 [[chains]]
 id = 'ibc-0'

config_example.toml

@@ -2,7 +2,6 @@
 timeout = '10s'
 strategy = 'naive'
 log_level = 'error'
-log_json = false
 
 [[chains]]
 id = 'ibc-0'

relayer-cli/src/components.rs

@@ -1,5 +1,6 @@
 use std::io;
 
+use abscissa_core::component::Id;
 use abscissa_core::{Component, FrameworkError};
 use tracing_subscriber::fmt::{
     format::{Format, Json, JsonFields},
@@ -11,6 +12,8 @@ use tracing_subscriber::{reload::Handle, EnvFilter, FmtSubscriber};
 
 use ibc_relayer::config::GlobalConfig;
 
+pub const TRACING_COMPONENT_ID: Id = Id::new("ibc_relayer_cli::components::Tracing");
+
 /// Custom types to simplify the `Tracing` definition below
 type Formatter = TracingFormatter<JsonFields, Format<Json, SystemTime>, StdWriter>;
 type StdWriter = fn() -> io::Stderr;

relayer-cli/src/conclude.rs

@@ -60,12 +60,18 @@ use std::fmt;
 use serde::Serialize;
 use tracing::error;
 
+use crate::components::TRACING_COMPONENT_ID;
+use crate::prelude::{app_reader, Application};
+
 /// Functional-style method to exit a program.
 ///
 /// ## Note: See `Output::exit()` for the preferred method of exiting a relayer command.
 pub fn exit_with(out: Output) {
     // Handle the output message
-    println!("{}", serde_json::to_string(&out).unwrap());
+    match json() {
+        true => println!("{}", serde_json::to_string(&out).unwrap()),
+        false => println!("{}: {}", out.status, out.result),
+    }
 
     // The return code
     if out.status == Status::Error {
@@ -75,6 +81,17 @@ pub fn exit_with(out: Output) {
     }
 }
 
+/// Returns true if the application global json flag `-j` or `--json` is enabled.
+/// Returns false otherwise.
+pub fn json() -> bool {
+    let a = app_reader();
+    // if the custom Tracing component is loaded, then JSON is enabled
+    a.state()
+        .components
+        .get_by_id(TRACING_COMPONENT_ID)
+        .is_some()
+}
+
 /// Exits the program. Useful when a type produces an error which can no longer be propagated, and
 /// the program must exit instead.
 ///

relayer/tests/config/fixtures/relayer_conf_example.toml

@@ -2,7 +2,6 @@
 timeout = '10s'
 strategy = 'naive'
 log_level = 'error'
-log_json = false
 
 [[chains]]
 id = 'chain_A'