Expand klog format to also include response status

src/protocol/http/src/request.rs

@@ -5,7 +5,7 @@
 use std::fmt;
 use std::mem::MaybeUninit;
 
-use crate::{Error, ParseResult};
+use crate::{response::status_line, Error, ParseResult};
 use httparse::{Header, ParserConfig, Status};
 use logger::{error, klog};
 use protocol_common::{Parse, ParseOk};
@@ -146,16 +146,25 @@ impl Parse<ParseData> for RequestParser {
 impl logger::Klog for Request {
     type Response = crate::Response;
 
-    fn klog(&self, _: &Self::Response) {
+    fn klog(&self, response: &Self::Response) {
         use bstr::BStr;
 
+        let status = response.status();
+        let line = status_line(status).unwrap_or("");
+
         match self.data() {
-            RequestData::Get(key) => klog!("GET {}", BStr::new(key)),
-            RequestData::Delete(key) => klog!("DELETE {}", BStr::new(key)),
+            RequestData::Get(key) => klog!("GET '{}' => {} {}", BStr::new(key), status, line),
+            RequestData::Delete(key) => klog!("DELETE '{}' => {} {}", BStr::new(key), status, line),
             RequestData::Put(key, val) => {
-                klog!("PUT {} length={}", BStr::new(key), val.len())
+                klog!(
+                    "PUT '{}' {} => {} {}",
+                    BStr::new(key),
+                    val.len(),
+                    status,
+                    line
+                )
             }
-        }
+        };
     }
 }
 

src/protocol/http/src/response.rs

@@ -16,10 +16,15 @@ impl Response {
     pub fn builder(status: u16) -> ResponseBuilder {
         ResponseBuilder::new(status)
     }
+
+    pub fn status(&self) -> u16 {
+        self.builder.status
+    }
 }
 
 pub struct ResponseBuilder {
     headers: Vec<u8>,
+    status: u16,
     close: bool,
 }
 
@@ -30,13 +35,14 @@ impl ResponseBuilder {
             &mut data,
             "HTTP/1.1 {} {}\r\n",
             status,
-            STATUSES.get(&status).copied().unwrap_or("")
+            status_line(status).unwrap_or("")
         )
         .unwrap();
 
         Self {
             headers: data,
             close: false,
+            status,
         }
     }
 
@@ -82,6 +88,7 @@ impl ResponseBuilder {
         Self {
             headers: std::mem::take(&mut self.headers),
             close: self.close,
+            status: self.status,
         }
     }
 }
@@ -122,6 +129,10 @@ impl Compose for Response {
     }
 }
 
+pub(crate) fn status_line(status: u16) -> Option<&'static str> {
+    STATUSES.get(&status).copied()
+}
+
 const STATUSES: Map<u16, &'static str> = phf_map! {
     // Informational Responses
     100u16 => "Continue",