Merge branch 'sh-add-http-status-code' into 'master'

Add HTTP status code to internal API logs

Closes #450

See merge request gitlab-org/gitlab-shell!376

1 files changed, 7 insertions, 3 deletions

diff --git a/client/gitlabnet.go b/client/gitlabnet.go
index 67c48c7..7fbf63e 100644
--- a/client/gitlabnet.go
+++ b/client/gitlabnet.go
@@ -123,18 +123,22 @@ func (c *GitlabNetClient) DoRequest(method, path string, data interface{}) (*htt
 		"url":         request.URL.String(),
 		"duration_ms": time.Since(start) / time.Millisecond,
 	}
+	logger := log.WithFields(fields)
 
 	if err != nil {
-		log.WithError(err).WithFields(fields).Error("Internal API unreachable")
+		logger.WithError(err).Error("Internal API unreachable")
 		return nil, fmt.Errorf("Internal API unreachable")
 	}
 
+	if response != nil {
+		logger = logger.WithField("status", response.StatusCode)
+	}
 	if err := parseError(response); err != nil {
-		log.WithError(err).WithFields(fields).Error("Internal API error")
+		logger.WithError(err).Error("Internal API error")
 		return nil, err
 	}
 
-	log.WithFields(fields).Info("Finished HTTP request")
+	logger.Info("Finished HTTP request")
 
 	return response, nil
 }