remove file events and last offset

api/fs.go

@@ -367,10 +367,6 @@ type FrameReader struct {
 	frame       *StreamFrame
 	frameOffset int
 
-	// To handle printing the file events
-	fileEventOffset int
-	fileEvent       []byte
-
 	byteOffset int
 }
 
@@ -417,23 +413,6 @@ func (f *FrameReader) Read(p []byte) (n int, err error) {
 		}
 	}
 
-	if f.frame.FileEvent != "" && len(f.fileEvent) == 0 {
-		f.fileEvent = []byte(fmt.Sprintf("\nnomad: %q\n", f.frame.FileEvent))
-		f.fileEventOffset = 0
-	}
-
-	// If there is a file event we inject it into the read stream
-	if l := len(f.fileEvent); l != 0 && l != f.fileEventOffset {
-		n = copy(p, f.fileEvent[f.fileEventOffset:])
-		f.fileEventOffset += n
-		return n, nil
-	}
-
-	if len(f.fileEvent) == f.fileEventOffset {
-		f.fileEvent = nil
-		f.fileEventOffset = 0
-	}
-
 	// Copy the data out of the frame and update our offset
 	n = copy(p, f.frame.Data[f.frameOffset:])
 	f.frameOffset += n

command/fs.go

@@ -329,9 +329,6 @@ func (f *FSCommand) followFile(client *api.Client, alloc *api.Allocation,
 
 		// End the streaming
 		r.Close()
-
-		// Output the last offset
-		f.Ui.Output(fmt.Sprintf("\nLast outputted offset (bytes): %d", frameReader.Offset()))
 	}()
 
 	return r, nil

command/logs.go

@@ -225,9 +225,6 @@ func (l *LogsCommand) followFile(client *api.Client, alloc *api.Allocation,
 
 		// End the streaming
 		r.Close()
-
-		// Output the last offset
-		l.Ui.Output(fmt.Sprintf("\nLast outputted offset (bytes): %d", frameReader.Offset()))
 	}()
 
 	return r, nil