about summary refs log tree commit diff
path: root/users/Profpatsch/read-http.rs
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2021-01-31T15·38+0100
committerProfpatsch <mail@profpatsch.de>2021-01-31T16·06+0000
commit492b79ec7a1844700ff75e19b39e3bc21f93dc23 (patch)
tree8b03f572a054bee26f511ee80c746c4ca15eb64c /users/Profpatsch/read-http.rs
parent83634341aa6683e1b96717757557c7d83a89b3fd (diff)
feat(users/Profpatsch): add die_* helpers for semantic exit errors r/2176
There is this semantic exit code schema championed by execline and
skaware tooling, and we refined and documented it a bit in lorri
https://github.com/nix-community/lorri/blob/d1d673d42090f0cfe8ab9b92b465315a9e7d30a3/src/ops/mod.rs#L24-L35
in the past.

This just transcribes the error messages into simple helper functions.

Applies the functions to the places where we would panic or die
`sys::exit()` instead.

Change-Id: I15ca05cd6f99a25a3378518be94110eab416354e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2475
Tested-by: BuildkiteCI
Reviewed-by: Profpatsch <mail@profpatsch.de>
Diffstat (limited to '')
-rw-r--r--users/Profpatsch/read-http.rs (renamed from users/Profpatsch/read-http/read-http.rs)30
1 files changed, 14 insertions, 16 deletions
diff --git a/users/Profpatsch/read-http/read-http.rs b/users/Profpatsch/read-http.rs
index ab2c3887d7..de112f4c77 100644
--- a/users/Profpatsch/read-http/read-http.rs
+++ b/users/Profpatsch/read-http.rs
@@ -2,10 +2,12 @@ extern crate httparse;
 extern crate netencode;
 extern crate arglib_netencode;
 extern crate ascii;
+extern crate exec_helpers;
 
 use std::os::unix::io::FromRawFd;
 use std::io::Read;
 use std::io::Write;
+use exec_helpers::{die_user_error, die_expected_error, die_temporary};
 
 use netencode::{U, T};
 
@@ -15,25 +17,21 @@ enum What {
 }
 
 fn main() -> std::io::Result<()> {
-    fn die<T: std::fmt::Display>(msg: T) -> ! {
-        eprintln!("{}", msg);
-        std::process::exit(1);
-    }
 
     let what : What = match arglib_netencode::arglib_netencode(None).unwrap() {
         T::Record(rec) => match rec.get("what") {
             Some(T::Text(t)) => match t.as_str() {
                 "request" => What::Request,
                 "response" => What::Response,
-                _ => die("read-http arglib: what should be either t:request or t:response"),
+                _ => die_user_error("read-http arglib", "`what` should be either t:request or t:response"),
             },
-            Some(o) => die(format!("read-http arglib: expected a record of text, got {:#?}", o)),
+            Some(o) => die_user_error("read-http arglib", format!("expected a record of text, got {:#?}", o)),
             None => {
                 eprintln!("read-http arglib: no `what` given, defaulting to Response");
                 What::Response
             }
         }
-        o => die(format!("read-http arglib: expected a record, got {:#?}", o))
+        o => die_user_error("read-http arglib", format!("expected a record, got {:#?}", o))
     };
 
     fn read_stdin_to_complete<F>(mut parse: F) -> ()
@@ -49,13 +47,13 @@ fn main() -> std::io::Result<()> {
                 Ok(size) => if size == 0 {
                     break;
                 },
-                Err(err) => panic!("could not read from stdin, {:?}", err)
+                Err(err) => die_temporary("read-http", format!("could not read from stdin, {:?}", err))
             }
             match parse(&buf) {
                 Ok(status) => {
                     res = status;
                 }
-                Err(err) => die(format!("httparse parsing failed: {:#?}", err))
+                Err(err) => die_temporary("read-http", format!("httparse parsing failed: {:#?}", err))
             }
         }
     }
@@ -84,7 +82,7 @@ fn main() -> std::io::Result<()> {
                         return Some(());
                     }
                 },
-                Some(Err(err)) => die(format!("error reading from stdin: {:?}", err)),
+                Some(Err(err)) => die_temporary("read-http", format!("error reading from stdin: {:?}", err)),
                 None => return None
             }
         }
@@ -101,10 +99,10 @@ fn main() -> std::io::Result<()> {
             match read_till_end_of_header(&mut buf, stdin.lock()) {
                 Some(()) => match req.parse(&buf) {
                     Ok(httparse::Status::Complete(_body_start)) => {},
-                    Ok(httparse::Status::Partial) => die("httparse should have gotten a full header"),
-                    Err(err) => die(format!("httparse response parsing failed: {:#?}", err))
+                    Ok(httparse::Status::Partial) => die_expected_error("read-http", "httparse should have gotten a full header"),
+                    Err(err) => die_expected_error("read-http", format!("httparse response parsing failed: {:#?}", err))
                 },
-                None => die(format!("httparse end of stdin reached before able to parse request headers"))
+                None => die_expected_error("read-http", format!("httparse end of stdin reached before able to parse request headers"))
             }
             let method = req.method.expect("method must be filled on complete parse");
             let path = req.path.expect("path must be filled on complete parse");
@@ -116,10 +114,10 @@ fn main() -> std::io::Result<()> {
             match read_till_end_of_header(&mut buf, stdin.lock()) {
                 Some(()) => match resp.parse(&buf) {
                     Ok(httparse::Status::Complete(_body_start)) => {},
-                    Ok(httparse::Status::Partial) => die("httparse should have gotten a full header"),
-                    Err(err) => die(format!("httparse response parsing failed: {:#?}", err))
+                    Ok(httparse::Status::Partial) => die_expected_error("read-http", "httparse should have gotten a full header"),
+                    Err(err) => die_expected_error("read-http", format!("httparse response parsing failed: {:#?}", err))
                 },
-                None => die(format!("httparse end of stdin reached before able to parse response headers"))
+                None => die_expected_error("read-http", format!("httparse end of stdin reached before able to parse response headers"))
             }
             let code = resp.code.expect("code must be filled on complete parse");
             let reason = resp.reason.expect("reason must be filled on complete parse");