From 2b6a7ebd0d295e07ef11dc63f6334427a72ee84f Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Fri, 26 Jan 2018 14:56:13 -0800
Subject: [PATCH] Remove logging

---
 client/fs_endpoint.go       | 19 -------------------
 nomad/client_fs_endpoint.go | 14 +-------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/client/fs_endpoint.go b/client/fs_endpoint.go
index b810954df..4b73461c2 100644
--- a/client/fs_endpoint.go
+++ b/client/fs_endpoint.go
@@ -90,8 +90,6 @@ func (f *FileSystem) Logs(conn io.ReadWriteCloser) {
 	defer metrics.MeasureSince([]string{"client", "file_system", "logs"}, time.Now())
 	defer conn.Close()
 
-	f.c.logger.Printf("--------- FileSystem:  Logs called")
-
 	// Decode the arguments
 	var req cstructs.FsLogsRequest
 	decoder := codec.NewDecoder(conn, structs.MsgpackHandle)
@@ -102,8 +100,6 @@ func (f *FileSystem) Logs(conn io.ReadWriteCloser) {
 		return
 	}
 
-	f.c.logger.Printf("--------- FileSystem:  Read request: %+v", req)
-
 	// Check node read permissions
 	if aclObj, err := f.c.ResolveToken(req.QueryOptions.AuthToken); err != nil {
 		f.handleStreamResultError(err, nil, encoder)
@@ -204,9 +200,6 @@ func (f *FileSystem) Logs(conn io.ReadWriteCloser) {
 			case errCh <- err:
 			case <-ctx.Done():
 			}
-			f.c.logger.Printf("--------- FileSystem:  logs finished, err \"%v\" sent", err)
-		} else {
-			f.c.logger.Printf("--------- FileSystem:  logs finished")
 		}
 	}()
 
@@ -215,7 +208,6 @@ func (f *FileSystem) Logs(conn io.ReadWriteCloser) {
 		for {
 			if _, err := conn.Read(nil); err != nil {
 				if err == io.EOF {
-					f.c.logger.Printf("--------- FileSystem:  remote side closed")
 					cancel()
 					return
 				}
@@ -232,14 +224,9 @@ OUTER:
 			break OUTER
 		case frame, ok := <-frames:
 			if !ok {
-				f.c.logger.Printf("--------- FileSystem:  Frame stream closed")
 				break OUTER
-			} else if frame == nil {
-				f.c.logger.Printf("--------- FileSystem:  Got nil frame")
 			}
 
-			f.c.logger.Printf("--------- FileSystem:  Got frame w/ payload size %d", len(frame.Data))
-
 			var resp cstructs.StreamErrWrapper
 			if req.PlainText {
 				resp.Payload = frame.Data
@@ -250,26 +237,20 @@ OUTER:
 				}
 
 				resp.Payload = buf.Bytes()
-				f.c.logger.Printf("--------- FileSystem:  filled payload with %d bytes", len(resp.Payload))
 				buf.Reset()
 			}
 
 			if err := encoder.Encode(resp); err != nil {
-				f.c.logger.Printf("--------- FileSystem:  Err sending payload: %v", err)
 				streamErr = err
 				break OUTER
 			}
-
-			f.c.logger.Printf("--------- FileSystem:  Sent frame with payload of size: %d", len(resp.Payload))
 		}
 	}
 
 	if streamErr != nil {
-		f.c.logger.Printf("--------- FileSystem:  Logs finished w/ err: %v", streamErr)
 		f.handleStreamResultError(streamErr, helper.Int64ToPtr(500), encoder)
 		return
 	}
-	f.c.logger.Printf("--------- FileSystem:  Logs finished with no error")
 }
 
 func (f *FileSystem) logs(ctx context.Context, follow, plain bool, offset int64,
diff --git a/nomad/client_fs_endpoint.go b/nomad/client_fs_endpoint.go
index e19eb4f20..02b01ceae 100644
--- a/nomad/client_fs_endpoint.go
+++ b/nomad/client_fs_endpoint.go
@@ -43,8 +43,6 @@ func (f *FileSystem) handleStreamResultError(err error, code *int64, encoder *co
 func (f *FileSystem) Logs(conn io.ReadWriteCloser) {
 	defer conn.Close()
 
-	f.srv.logger.Printf("--------- Server FileSystem:  Logs called")
-
 	// Decode the arguments
 	var args cstructs.FsLogsRequest
 	decoder := codec.NewDecoder(conn, structs.MsgpackHandle)
@@ -116,8 +114,6 @@ func (f *FileSystem) Logs(conn io.ReadWriteCloser) {
 
 		// TODO Forward streaming
 		//return s.srv.forwardServer(srv, "ClientStats.Stats", args, reply)
-		f.srv.logger.Printf("ALEX: No connection to node %q", nodeID)
-		f.srv.logger.Printf("ALEX: Have: %v", f.srv.connectedNodes())
 		return
 	}
 
@@ -128,12 +124,7 @@ func (f *FileSystem) Logs(conn io.ReadWriteCloser) {
 		f.handleStreamResultError(err, nil, encoder)
 		return
 	}
-	defer func() {
-		f.srv.logger.Printf("ALEX: Closing stream")
-		if err := stream.Close(); err != nil {
-			f.srv.logger.Printf("ALEX: Failed to close stream: %v", err)
-		}
-	}()
+	defer stream.Close()
 
 	// Write the RpcNomad byte to set the mode
 	if _, err := stream.Write([]byte{byte(pool.RpcStreaming)}); err != nil {
@@ -157,10 +148,7 @@ func (f *FileSystem) Logs(conn io.ReadWriteCloser) {
 		return
 	}
 
-	// TODO Somehow the client keeps streaming
-	f.srv.logger.Printf("ALEX: STARTED BRIDGING")
 	Bridge(conn, stream)
-	f.srv.logger.Printf("ALEX: FINISHED BRIDGING")
 	return
 }