From d8a836e618c187e6896da77b05a574c7016bc8c5 Mon Sep 17 00:00:00 2001
From: Brian Akins <brian@akins.org>
Date: Tue, 9 Jun 2015 13:40:37 -0400
Subject: [PATCH] Simple debug HTTP request logging

---
 etcdserver/etcdhttp/client.go | 2 +-
 etcdserver/etcdhttp/http.go   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/etcdserver/etcdhttp/client.go b/etcdserver/etcdhttp/client.go
index e2ba80e43..def5d8348 100644
--- a/etcdserver/etcdhttp/client.go
+++ b/etcdserver/etcdhttp/client.go
@@ -104,7 +104,7 @@ func NewClientHandler(server *etcdserver.EtcdServer) http.Handler {
 	mux.Handle(deprecatedMachinesPrefix, dmh)
 	handleSecurity(mux, sech)
 
-	return mux
+	return requestLogger(mux)
 }
 
 type keysHandler struct {
diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/etcdhttp/http.go
index e86615a50..f9b1853d7 100644
--- a/etcdserver/etcdhttp/http.go
+++ b/etcdserver/etcdhttp/http.go
@@ -78,3 +78,10 @@ func allowMethod(w http.ResponseWriter, m string, ms ...string) bool {
 	http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
 	return false
 }
+
+func requestLogger(handler http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		plog.Debugf("[%s] %s remote:%s", r.Method, r.RequestURI, r.RemoteAddr)
+		handler.ServeHTTP(w, r)
+	})
+}