Revert "Merge pull request #15 from beam-cloud/np/fix-nil-error"

nickpetrovic · nickpetrovic · commit adce9cfbc5d8 · 2024-11-07T13:44:47.000-05:00
This reverts commit 4bdf470, reversing changes made to 2ed2e4b.
diff --git a/pkg/client.go b/pkg/client.go
@@ -126,10 +126,8 @@ func NewBlobCacheClient(ctx context.Context, cfg BlobCacheConfig) (*BlobCacheCli
 }
 
 func (c *BlobCacheClient) Cleanup() error {
-	if c.cfg.BlobFs.Enabled {
-		if c.blobfsServer != nil {
-			return c.blobfsServer.Unmount()
-		}
+	if c.cfg.BlobFs.Enabled && c.blobfsServer != nil {
+		c.blobfsServer.Unmount()
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -126,10 +126,8 @@ func NewBlobCacheClient(ctx context.Context, cfg BlobCacheConfig) (*BlobCacheCli`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`func (c *BlobCacheClient) Cleanup() error {`
`129`		`- if c.cfg.BlobFs.Enabled {`
`130`		`- if c.blobfsServer != nil {`
`131`		`- return c.blobfsServer.Unmount()`
`132`		`- }`
	`129`	`+ if c.cfg.BlobFs.Enabled && c.blobfsServer != nil {`
	`130`	`+ c.blobfsServer.Unmount()`
`133`	`131`	`}`
`134`	`132`	`return nil`
`135`	`133`	`}`