From 90dae742e4ae801c7376f42a5d7d0115196f2877 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Mon, 22 Apr 2019 04:23:09 +0200 Subject: [PATCH] refactor: simplify. --- dumper/file/file.go | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/dumper/file/file.go b/dumper/file/file.go index bada295..f230b78 100644 --- a/dumper/file/file.go +++ b/dumper/file/file.go @@ -104,16 +104,9 @@ func watch(acmeFile string, baseConfig *dumper.BaseConfig) error { } func manageEvent(watcher *fsnotify.Watcher, event fsnotify.Event, acmeFile string, previousHash []byte, baseConfig *dumper.BaseConfig) ([]byte, error) { - if event.Op&fsnotify.Rename == fsnotify.Rename { - err := watcher.Remove(acmeFile) - if err != nil { - return nil, err - } - - err = watcher.Add(acmeFile) - if err != nil { - return nil, err - } + err := manageRename(watcher, event, acmeFile) + if err != nil { + return nil, err } hash, err := calculateHash(acmeFile) @@ -136,6 +129,22 @@ func manageEvent(watcher *fsnotify.Watcher, event fsnotify.Event, acmeFile strin return hash, nil } +func manageRename(watcher *fsnotify.Watcher, event fsnotify.Event, acmeFile string) error { + if event.Op&fsnotify.Rename == fsnotify.Rename { + err := watcher.Remove(acmeFile) + if err != nil { + return err + } + + err = watcher.Add(acmeFile) + if err != nil { + return err + } + } + + return nil +} + func calculateHash(acmeFile string) ([]byte, error) { file, err := os.Open(acmeFile) if err != nil {