diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-29 11:31:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-29 11:31:39 -0400 |
| commit | 95ff349de22e01eaa76cfc19891cc37952789b82 (patch) | |
| tree | ddfaeb501528c01a93624e357774116f4819f210 /libpod/util.go | |
| parent | 73836e0c6a22d919dd8be297bafd137f1bd8ec9e (diff) | |
| parent | e6557bf0a291f4462081e50461b1b9b8715d1da3 (diff) | |
| download | podman-95ff349de22e01eaa76cfc19891cc37952789b82.tar.gz podman-95ff349de22e01eaa76cfc19891cc37952789b82.tar.bz2 podman-95ff349de22e01eaa76cfc19891cc37952789b82.zip | |
Merge pull request #14031 from Luap99/errcheck
enable errcheck linter
Diffstat (limited to 'libpod/util.go')
| -rw-r--r-- | libpod/util.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libpod/util.go b/libpod/util.go index 51fe60427..1753b4f34 100644 --- a/libpod/util.go +++ b/libpod/util.go @@ -55,8 +55,11 @@ func WaitForFile(path string, chWait chan error, timeout time.Duration) (bool, e if err := watcher.Add(filepath.Dir(path)); err == nil { inotifyEvents = watcher.Events } - defer watcher.Close() - defer watcher.Remove(filepath.Dir(path)) + defer func() { + if err := watcher.Close(); err != nil { + logrus.Errorf("Failed to close fsnotify watcher: %v", err) + } + }() } var timeoutChan <-chan time.Time |