Merge #1364

1364: Include query string in logs r=ashleygwilliams

Conduit doesn't provide any methods that give us the path and query
string if present, so we have to do some additional junk to make that
happen ourselves.

Author: bors-voyager[bot]

src/middleware/log_request.rs

@@ -2,6 +2,7 @@
 //! information that we care about like User-Agent and Referer
 
 use conduit::Request;
+use std::fmt;
 use std::time::Instant;
 use super::prelude::*;
 use util::request_header;
@@ -36,7 +37,7 @@ impl Handler for LogRequests {
              status={status} user_agent=\"{user_agent}\" referer=\"{referer}\"",
             level = level,
             method = req.method(),
-            path = req.path(),
+            path = FullPath(req),
             ip = request_header(req, "X-Forwarded-For"),
             time_ms = response_time,
             user_agent = request_header(req, "User-Agent"),
@@ -58,3 +59,15 @@ impl Handler for LogRequests {
         res
     }
 }
+
+struct FullPath<'a>(&'a Request);
+
+impl<'a> fmt::Display for FullPath<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.0.path())?;
+        if let Some(q_string) = self.0.query_string() {
+            write!(f, "?{}", q_string)?;
+        }
+        Ok(())
+    }
+}