From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 May 2021 20:41:19 +0000 (+0100)
Subject: cmdlistener: Break out write_error
X-Git-Tag: otter-0.6.0~231
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e9d5bd62eebd83770fac562eaac12fbc0ba5aa64;p=otter.git

cmdlistener: Break out write_error

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 0aa83bd4..64ad89d1 100644
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -1356,13 +1356,16 @@ impl CommandStream<'_> {
         },
         Err(EOF) => break,
         Err(IO(e)) => Err(e).context("read command stream")?,
-        Err(Parse(s)) => {
-          let resp = MgmtResponse::Error { error: ME::CommandParseFailed(s) };
-          self.chan.write.write(&resp).context("swrite command stream")?;
-        }
+        Err(Parse(s)) => self.write_error(ME::CommandParseFailed(s))?,
       }
     }
   }
+
+  #[throws(CSE)]
+  pub fn write_error(&mut self, error: MgmtError) {
+    let resp = MgmtResponse::Error { error };
+    self.chan.write.write(&resp).context("swrite error to command stream")?;
+  }
 }
 
 impl CommandStreamData<'_> {