From 7cfb94cbc5760fea2ba3a377b2be13e285d1c9c0 Mon Sep 17 00:00:00 2001 From: hangaoshuai Date: Sun, 11 Feb 2018 11:02:23 +0800 Subject: [PATCH] Use SeekStart, SeekCurrent, and SeekEnd repalace of deprecated constant --- pkg/kubelet/kuberuntime/logs/logs.go | 4 ++-- pkg/util/tail/tail.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/kubelet/kuberuntime/logs/logs.go b/pkg/kubelet/kuberuntime/logs/logs.go index 3d61d40dac..ae98c2f230 100644 --- a/pkg/kubelet/kuberuntime/logs/logs.go +++ b/pkg/kubelet/kuberuntime/logs/logs.go @@ -278,7 +278,7 @@ func ReadLogs(path, containerID string, opts *LogOptions, runtimeService interna if err != nil { return fmt.Errorf("failed to tail %d lines of log file %q: %v", opts.tail, path, err) } - if _, err := f.Seek(start, os.SEEK_SET); err != nil { + if _, err := f.Seek(start, io.SeekStart); err != nil { return fmt.Errorf("failed to seek %d in log file %q: %v", start, path, err) } @@ -303,7 +303,7 @@ func ReadLogs(path, containerID string, opts *LogOptions, runtimeService interna if opts.follow { // Reset seek so that if this is an incomplete line, // it will be read again. - if _, err := f.Seek(-int64(len(l)), os.SEEK_CUR); err != nil { + if _, err := f.Seek(-int64(len(l)), io.SeekCurrent); err != nil { return fmt.Errorf("failed to reset seek in log file %q: %v", path, err) } if watcher == nil { diff --git a/pkg/util/tail/tail.go b/pkg/util/tail/tail.go index 23ad4ae791..cd9fc22c17 100644 --- a/pkg/util/tail/tail.go +++ b/pkg/util/tail/tail.go @@ -53,7 +53,7 @@ func ReadAtMost(path string, max int64) ([]byte, bool, error) { if size < max { max = size } - offset, err := f.Seek(-max, os.SEEK_END) + offset, err := f.Seek(-max, io.SeekEnd) if err != nil { return nil, false, err } @@ -70,7 +70,7 @@ func FindTailLineStartIndex(f io.ReadSeeker, n int64) (int64, error) { if n < 0 { return 0, nil } - size, err := f.Seek(0, os.SEEK_END) + size, err := f.Seek(0, io.SeekEnd) if err != nil { return 0, err } @@ -82,7 +82,7 @@ func FindTailLineStartIndex(f io.ReadSeeker, n int64) (int64, error) { left = 0 buf = make([]byte, right) } - if _, err := f.Seek(left, os.SEEK_SET); err != nil { + if _, err := f.Seek(left, io.SeekStart); err != nil { return 0, err } if _, err := f.Read(buf); err != nil {