conch| in trace mode, stop dumping the request and response structs. …

…they are needless noise (cherry picked from commit 020648a)
joyent · Mar 8, 2019 · 1874e62 · 1874e62
1 parent c71ab3f
commit 1874e62
Showing 1 changed file with 15 additions and 23 deletions.
diff --git a/pkg/conch/sling.go b/pkg/conch/sling.go
@@ -107,25 +107,21 @@ func (c *Conch) get(url string, data interface{}) error {
 
 func (c *Conch) httpDo(req *http.Request, data interface{}) (*http.Response, error) {
 
-	if c.Trace {
-		c.ddp(req)
-	} else {
-		c.debugLog(fmt.Sprintf(
-			"Request: %s %s",
-			req.Method,
-			req.URL,
-		))
-
-		if (req.Method == "POST") && (req.Body != nil) {
-			if read, err := req.GetBody(); err == nil {
-				if bodyBytes, err := ioutil.ReadAll(read); err == nil {
-					c.debugLog(
-						fmt.Sprintf(
-							"  Request Body: %s",
-							string(bodyBytes),
-						),
-					)
-				}
+	c.debugLog(fmt.Sprintf(
+		"Request: %s %s",
+		req.Method,
+		req.URL,
+	))
+
+	if (req.Method == "POST") && (req.Body != nil) {
+		if read, err := req.GetBody(); err == nil {
+			if bodyBytes, err := ioutil.ReadAll(read); err == nil {
+				c.debugLog(
+					fmt.Sprintf(
+						"  Request Body: %s",
+						string(bodyBytes),
+					),
+				)
 			}
 		}
 	}
@@ -135,10 +131,6 @@ func (c *Conch) httpDo(req *http.Request, data interface{}) (*http.Response, err
 		return res, err
 	}
 
-	if c.Trace {
-		c.ddp(res)
-	}
-
 	defer res.Body.Close()
 
 	bodyBytes, err := ioutil.ReadAll(res.Body)