From 88b17784d0851760787fc47276b7f24423f57040 Mon Sep 17 00:00:00 2001
From: Dario Anongba Varela <dario.varela@consensys.net>
Date: Wed, 10 Nov 2021 19:00:41 +0100
Subject: [PATCH] chore: File watcher cherry pick (#416)

---
 CHANGELOG.md                              | 5 +++++
 src/infra/hashicorp/token/file-watcher.go | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ebae7a25..88d9181fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Quorum Key Manager Release Notes
 
+## v21.9.3 (2021-11-10)
+
+### 🛠 Bug fixes
+* Fixes bug in Hashicorp client that prevents the process from exiting when a new token is written or updated from filesystem.
+
 ## v21.9.2 (2021-10-18)
 
 ### 🛠 Bug fixes
diff --git a/src/infra/hashicorp/token/file-watcher.go b/src/infra/hashicorp/token/file-watcher.go
index fdc819d0a..1cebc8404 100644
--- a/src/infra/hashicorp/token/file-watcher.go
+++ b/src/infra/hashicorp/token/file-watcher.go
@@ -77,17 +77,16 @@ func (rtl *RenewTokenWatcher) Start(ctx context.Context) error {
 			}
 
 			if event.Op&fsnotify.Write == fsnotify.Write {
-				rtl.logger.With("event_name", event.Name).Debug("file has been updated")
+				rtl.logger.Debug("token file has been updated")
 				if err := rtl.refreshToken(); err != nil {
 					return err
 				}
 			} else if event.Op&fsnotify.Create == fsnotify.Create {
-				rtl.logger.With("event_name", event.Name).Debug("file has been created")
+				rtl.logger.Debug("token file has been created")
 				if err := rtl.refreshToken(); err != nil {
 					return err
 				}
 			}
-			rtl.logger.Debug("event:", event)
 		case err, ok := <-rtl.watcher.Errors:
 			if !ok {
 				return nil
@@ -129,6 +128,7 @@ func (rtl *RenewTokenWatcher) refreshToken() error {
 	}
 
 	rtl.client.SetToken(token)
+
 	// Immediately delete the file after it was read
 	err = os.Remove(rtl.tokenPath)
 	if err != nil {