From 6869f6d9ddee4b471e90eb1b1d52982ad1a6df34 Mon Sep 17 00:00:00 2001
From: kannappanr <30541348+kannappanr@users.noreply.github.com>
Date: Fri, 26 Oct 2018 14:41:25 -0700
Subject: [PATCH] Remove unwanted logs (#6708)

---
 cmd/gateway/s3/gateway-s3.go | 2 --
 cmd/logger/logger.go         | 2 +-
 cmd/object-handlers.go       | 4 ++--
 cmd/xl-v1-bucket.go          | 1 -
 cmd/xl-v1-multipart.go       | 8 --------
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/cmd/gateway/s3/gateway-s3.go b/cmd/gateway/s3/gateway-s3.go
index c0e120439..f3cdaa160 100644
--- a/cmd/gateway/s3/gateway-s3.go
+++ b/cmd/gateway/s3/gateway-s3.go
@@ -377,7 +377,6 @@ func (l *s3Objects) GetObject(ctx context.Context, bucket string, key string, st
 
 	if startOffset >= 0 && length >= 0 {
 		if err := opts.SetRange(startOffset, startOffset+length-1); err != nil {
-			logger.LogIf(ctx, err)
 			return minio.ErrorRespToObjectError(err, bucket, key)
 		}
 	}
@@ -388,7 +387,6 @@ func (l *s3Objects) GetObject(ctx context.Context, bucket string, key string, st
 	defer object.Close()
 
 	if _, err := io.Copy(writer, object); err != nil {
-		logger.LogIf(ctx, err)
 		return minio.ErrorRespToObjectError(err, bucket, key)
 	}
 	return nil
diff --git a/cmd/logger/logger.go b/cmd/logger/logger.go
index f5fd52d21..eea3a06ee 100644
--- a/cmd/logger/logger.go
+++ b/cmd/logger/logger.go
@@ -320,7 +320,7 @@ func logIf(ctx context.Context, err error) {
 	}
 
 	// Get full stack trace
-	trace := getTrace(2)
+	trace := getTrace(3)
 
 	// Get the cause for the Error
 	message := err.Error()
diff --git a/cmd/object-handlers.go b/cmd/object-handlers.go
index 4b5807ddf..9c15f66e7 100644
--- a/cmd/object-handlers.go
+++ b/cmd/object-handlers.go
@@ -266,8 +266,8 @@ func (api objectAPIHandlers) SelectObjectContentHandler(w http.ResponseWriter, r
 
 	// Executes the query on data-set
 	if err = s3select.Execute(w, s3s); err != nil {
-		logger.LogIf(ctx, err)
-
+		writeErrorResponse(w, toAPIErrorCode(err), r.URL)
+		return
 	}
 
 	for k, v := range objInfo.UserDefined {
diff --git a/cmd/xl-v1-bucket.go b/cmd/xl-v1-bucket.go
index 20a87acbc..c0f0e8c02 100644
--- a/cmd/xl-v1-bucket.go
+++ b/cmd/xl-v1-bucket.go
@@ -244,7 +244,6 @@ func (xl xlObjects) DeleteBucket(ctx context.Context, bucket string) error {
 			err := disk.DeleteVol(bucket)
 
 			if err != nil {
-				logger.LogIf(ctx, err)
 				dErrs[index] = err
 				return
 			}
diff --git a/cmd/xl-v1-multipart.go b/cmd/xl-v1-multipart.go
index 29a9ee45f..fc96cd1d2 100644
--- a/cmd/xl-v1-multipart.go
+++ b/cmd/xl-v1-multipart.go
@@ -385,7 +385,6 @@ func (xl xlObjects) PutObjectPart(ctx context.Context, bucket, object, uploadID
 	// Should return IncompleteBody{} error when reader has fewer bytes
 	// than specified in request header.
 	if n < data.Size() {
-		logger.LogIf(ctx, IncompleteBody{})
 		return pi, IncompleteBody{}
 	}
 
@@ -655,7 +654,6 @@ func (xl xlObjects) CompleteMultipartUpload(ctx context.Context, bucket string,
 				PartNumber: part.PartNumber,
 				GotETag:    part.ETag,
 			}
-			logger.LogIf(ctx, invp)
 			return oi, invp
 		}
 
@@ -666,17 +664,11 @@ func (xl xlObjects) CompleteMultipartUpload(ctx context.Context, bucket string,
 				ExpETag:    currentXLMeta.Parts[partIdx].ETag,
 				GotETag:    part.ETag,
 			}
-			logger.LogIf(ctx, invp)
 			return oi, invp
 		}
 
 		// All parts except the last part has to be atleast 5MB.
 		if (i < len(parts)-1) && !isMinAllowedPartSize(currentXLMeta.Parts[partIdx].ActualSize) {
-			logger.LogIf(ctx, PartTooSmall{
-				PartNumber: part.PartNumber,
-				PartSize:   currentXLMeta.Parts[partIdx].ActualSize,
-				PartETag:   part.ETag,
-			})
 			return oi, PartTooSmall{
 				PartNumber: part.PartNumber,
 				PartSize:   currentXLMeta.Parts[partIdx].ActualSize,