From 31bcd632c7fc731ef4ad5dfb95e045e8a50e48a0 Mon Sep 17 00:00:00 2001
From: Davyd McColl <davydm@gmail.com>
Date: Fri, 11 Jun 2021 17:06:47 +0200
Subject: :art: observe the error, if there is one

---
 pkg/app/app.go | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'pkg/app')

diff --git a/pkg/app/app.go b/pkg/app/app.go
index ad655aa33..753bf8844 100644
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -370,12 +370,26 @@ func TailLogsNative(logFilePath string, opts *humanlog.HandlerOptions) {
 	}
 }
 
+func OpenAndSeek(filepath string, offset int64) (*os.File, error) {
+	file, err := os.Open(filepath)
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = file.Seek(offset, 0)
+	if err != nil {
+		_ = file.Close()
+		return nil, err
+	}
+	return file, nil
+}
+
 func TailFrom(lastOffset int64, logFilePath string, opts *humanlog.HandlerOptions) error {
-	file, err := os.Open(logFilePath)
+	file, err := OpenAndSeek(logFilePath, lastOffset)
 	if err != nil {
 		return err
 	}
-	file.Seek(lastOffset, 0)
+
 	fileScanner := bufio.NewScanner(file)
 	var lines []string
 	for fileScanner.Scan() {
-- 
cgit v1.2.3