Merge branch 'master' into v3

# Conflicts: # cli/main.go
2017-02-04 16:12:42 -08:00
parent e910807973 9b29a0450c
commit 0cd6fa13a7
4 changed files with 50 additions and 23 deletions
--- a/cli/main.go
+++ b/cli/main.go
@@ -86,6 +86,11 @@ func main() {
 		l.Info(" Starting monitor")

 		// print features
+		if len(mon.HttpHeaders) > 0 {
+			for _, h := range mon.HttpHeaders {
+				logrus.Infof(" - HTTP-Header '%s' '%s'", h.Name, h.Value)
+			}
+		}
 		if mon.ExpectedStatusCode > 0 {
 			l.Infof(" - Expect HTTP %d", mon.ExpectedStatusCode)
 		}