display no other lines than JSON

so that the output of --json commands is pipeable
sozu-proxy · Dec 6, 2023 · 95de156 · 95de156
1 parent 0e62ff3
commit 95de156
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/bin/src/ctl/command.rs b/bin/src/ctl/command.rs
@@ -30,10 +30,15 @@ impl CommandManager {
 
             match response.status() {
                 ResponseStatus::Processing => {
-                    debug!("Proxy is processing: {}", response.message);
+                    if !self.json {
+                        debug!("Proxy is processing: {}", response.message);
+                    }
                 }
                 ResponseStatus::Failure => bail!("Request failed: {}", response.message),
                 ResponseStatus::Ok => {
+                    if !self.json {
+                        info!("{}", response.message);
+                    }
                     response.display(self.json)?;
                     break;
                 }
@@ -55,7 +60,9 @@ impl CommandManager {
 
             match response.status() {
                 ResponseStatus::Processing => {
-                    debug!("Processing: {}", response.message);
+                    if !self.json {
+                        debug!("Processing: {}", response.message);
+                    }
                 }
                 ResponseStatus::Failure => {
                     bail!(
@@ -143,7 +150,11 @@ impl CommandManager {
             let response = self.read_channel_message_with_timeout()?;
 
             match response.status() {
-                ResponseStatus::Processing => info!("Proxy is processing: {}", response.message),
+                ResponseStatus::Processing => {
+                    if !self.json {
+                        info!("Proxy is processing: {}", response.message);
+                    }
+                }
                 ResponseStatus::Failure => bail!(
                     "could not stop the worker {}: {}",
                     worker_id,
@@ -186,7 +197,9 @@ impl CommandManager {
 
                 match response.status() {
                     ResponseStatus::Processing => {
-                        debug!("Proxy is processing: {}", response.message);
+                        if !self.json {
+                            debug!("Proxy is processing: {}", response.message);
+                        }
                     }
                     ResponseStatus::Failure | ResponseStatus::Ok => {
                         response.display(self.json)?;

diff --git a/command/src/proto/display.rs b/command/src/proto/display.rs
@@ -114,7 +114,12 @@ pub fn print_json_response<T: ::serde::Serialize>(input: &T) -> Result<(), Displ
 impl Response {
     pub fn display(&self, json: bool) -> Result<(), DisplayError> {
         match self.status() {
-            ResponseStatus::Ok => println!("Success: {}", self.message),
+            ResponseStatus::Ok => {
+                // avoid displaying anything else than JSON
+                if !json {
+                    println!("Success: {}", self.message)
+                }
+            }
             ResponseStatus::Failure => println!("Failure: {}", self.message),
             ResponseStatus::Processing => {
                 return Err(DisplayError::WrongResponseType(