From 70acbd434508f936b82cb4e9218d5374f2705489 Mon Sep 17 00:00:00 2001
From: Lena Fuhrimann <6780471+cloudlena@users.noreply.github.com>
Date: Sat, 6 Jan 2018 14:09:06 +0100
Subject: [PATCH] Use adapters logging handler

---
 Gopkg.lock            | 16 ++++++++--------
 Gopkg.toml            |  8 ++++----
 cmd/s3manager/main.go |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 1ec8d91..63ad592 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -25,18 +25,18 @@
   revision = "1ea25387ff6f684839d82767c1733ff4d4d15d0a"
   version = "v1.1"
 
-[[projects]]
-  name = "github.com/gorilla/handlers"
-  packages = ["."]
-  revision = "90663712d74cb411cbef281bc1e08c19d1a76145"
-  version = "v1.3.0"
-
 [[projects]]
   name = "github.com/gorilla/mux"
   packages = ["."]
   revision = "7f08801859139f86dfafd1c296e2cba9a80d292e"
   version = "v1.6.0"
 
+[[projects]]
+  branch = "master"
+  name = "github.com/mastertinner/adapters"
+  packages = ["logging"]
+  revision = "599a2137b7d6f9d3c4e0fbc5cbd932fa78eec137"
+
 [[projects]]
   name = "github.com/minio/minio-go"
   packages = [".","pkg/credentials","pkg/encrypt","pkg/policy","pkg/s3signer","pkg/s3utils","pkg/set"]
@@ -83,11 +83,11 @@
   branch = "master"
   name = "golang.org/x/sys"
   packages = ["unix","windows"]
-  revision = "83801418e1b59fb1880e363299581ee543af32ca"
+  revision = "dd9ec17814d5b1de388ebe438ec013d57d8b3779"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "d05a3975fc1101d4255ad3e3388ceaeeff30f95bcc7dcf00f8e3a37fd1cbfb0d"
+  inputs-digest = "f576c4f470078c785c420a021bd30b9383c360ce7821ae39ff99ba7e75c75583"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 3c94e65..8eff70a 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -21,14 +21,14 @@
 #  version = "2.4.0"
 
 
-[[constraint]]
-  name = "github.com/gorilla/handlers"
-  version = "1.3.0"
-
 [[constraint]]
   name = "github.com/gorilla/mux"
   version = "1.6.0"
 
+[[constraint]]
+  branch = "master"
+  name = "github.com/mastertinner/adapters"
+
 [[constraint]]
   name = "github.com/minio/minio-go"
   version = "4.0.5"
diff --git a/cmd/s3manager/main.go b/cmd/s3manager/main.go
index 13e267e..1a36ce3 100644
--- a/cmd/s3manager/main.go
+++ b/cmd/s3manager/main.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
+	"github.com/mastertinner/adapters/logging"
 	"github.com/mastertinner/s3manager"
 	minio "github.com/minio/minio-go"
 	"github.com/pkg/errors"
@@ -81,5 +81,5 @@ func main() {
 		Path("/api/buckets/{bucketName}/objects/{objectName}").
 		Handler(s3manager.DeleteObjectHandler(s3))
 
-	log.Fatal(http.ListenAndServe(":"+*port, handlers.LoggingHandler(os.Stdout, r)))
+	log.Fatal(http.ListenAndServe(":"+*port, logging.Handler(os.Stdout)(r)))
 }