From 926b1e81e7059bdd9c0a15514b3add13b045b832 Mon Sep 17 00:00:00 2001
From: "Frederick F. Kautz IV" <fkautz@alumni.cmu.edu>
Date: Tue, 28 Apr 2015 12:22:12 -0700
Subject: [PATCH 1/2] Setting gimme to use go1.4.2

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4bd0691cb..3ce4a7de0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
 - cd ..
 sudo: false
 go:
-- 1.4.1
+- 1.4.2
 notifications:
   slack:
     secure: jlDBuqna7waJXJrl/EOeTH1fXgqJu3WrTDl0Sv7oJBNVH1Af4cGmHaa1oVWrYUMB7lEPjpuF+xcBNA+N+mcR53JbpqueR3sIKlokqHL4TPZBg4XX+1yqtmYMkL6V2woWQ7Wmtis0kDstSoVZjEUVHgk3YF8hcLlK49oMhTeqY08=

From 88cca647ea7847e7d078ff9d254577a61a17beb6 Mon Sep 17 00:00:00 2001
From: "Frederick F. Kautz IV" <fkautz@alumni.cmu.edu>
Date: Tue, 28 Apr 2015 18:06:09 -0700
Subject: [PATCH 2/2] Adding json logging to stderr

---
 pkg/api/api_router.go | 50 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/pkg/api/api_router.go b/pkg/api/api_router.go
index 04d8b6ef6..2f64ebe14 100644
--- a/pkg/api/api_router.go
+++ b/pkg/api/api_router.go
@@ -20,11 +20,15 @@ import (
 	"log"
 	"net/http"
 
+	"encoding/json"
+	"fmt"
 	router "github.com/gorilla/mux"
 	"github.com/minio-io/minio/pkg/api/config"
 	"github.com/minio-io/minio/pkg/api/quota"
 	"github.com/minio-io/minio/pkg/iodine"
 	"github.com/minio-io/minio/pkg/storage/drivers"
+	"os"
+	"time"
 )
 
 // private use
@@ -89,7 +93,6 @@ func HTTPHandler(domain string, driver drivers.Driver) http.Handler {
 	if err := conf.SetupConfig(); err != nil {
 		log.Fatal(iodine.New(err, map[string]string{"domain": domain}))
 	}
-
 	h := timeValidityHandler(mux)
 	h = ignoreResourcesHandler(h)
 	h = validateRequestHandler(conf, h)
@@ -98,5 +101,50 @@ func HTTPHandler(domain string, driver drivers.Driver) http.Handler {
 	//	h = quota.RequestLimit(h, 100, time.Duration(30*time.Minute))
 	//	h = quota.RequestLimit(h, 1000, time.Duration(24*time.Hour))
 	h = quota.ConnectionLimit(h, 5)
+	h = LogHandler(h)
 	return h
 }
+
+type logHandler struct {
+	http.Handler
+}
+
+// LogMessage is a serializable json log message
+type LogMessage struct {
+	Request         *http.Request
+	StartTime       time.Time
+	Duration        time.Duration
+	Status          int
+	ResponseHeaders http.Header
+}
+
+// LogWriter is used to capture status for log messages
+type LogWriter struct {
+	http.ResponseWriter
+	LogMessage *LogMessage
+}
+
+// WriteHeader writes headers and stores status in LogMessage
+func (w *LogWriter) WriteHeader(status int) {
+	w.LogMessage.Status = status
+	w.ResponseWriter.WriteHeader(status)
+	w.ResponseWriter.Header()
+}
+
+func (h *logHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	logMessage := &LogMessage{
+		StartTime: time.Now(),
+	}
+	logWriter := &LogWriter{ResponseWriter: w, LogMessage: logMessage}
+	h.Handler.ServeHTTP(logWriter, req)
+	logMessage.ResponseHeaders = w.Header()
+	logMessage.Request = req
+	logMessage.Duration = time.Now().Sub(logMessage.StartTime)
+	js, _ := json.Marshal(logMessage)
+	fmt.Fprintln(os.Stderr, string(js))
+}
+
+// LogHandler logs requests
+func LogHandler(h http.Handler) http.Handler {
+	return &logHandler{h}
+}