From ea1de3044e129d419f4e807f2624a009343a128f Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 9 Oct 2021 21:10:29 +0300 Subject: vetting and linting and some code restyling --- internal/io/fs/catfile.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'internal/io/fs/catfile.go') diff --git a/internal/io/fs/catfile.go b/internal/io/fs/catfile.go index 7f387bc..01c15ba 100644 --- a/internal/io/fs/catfile.go +++ b/internal/io/fs/catfile.go @@ -6,7 +6,9 @@ type CatFile struct { } // NewCatFile returns a new file catter. -func NewCatFile(filePath string, globID string, serverMessages chan<- string, limiter chan struct{}) CatFile { +func NewCatFile(filePath string, globID string, serverMessages chan<- string, + limiter chan struct{}) CatFile { + return CatFile{ readFile: readFile{ filePath: filePath, -- cgit v1.2.3 From 995c850d1f07f6221558d1c01924f2da6294f4ec Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 24 Oct 2021 12:59:08 +0300 Subject: Fix deadlock around aggregating data + server max concurrent file read limiter --- internal/io/fs/catfile.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'internal/io/fs/catfile.go') diff --git a/internal/io/fs/catfile.go b/internal/io/fs/catfile.go index 01c15ba..e4676f3 100644 --- a/internal/io/fs/catfile.go +++ b/internal/io/fs/catfile.go @@ -6,9 +6,7 @@ type CatFile struct { } // NewCatFile returns a new file catter. -func NewCatFile(filePath string, globID string, serverMessages chan<- string, - limiter chan struct{}) CatFile { - +func NewCatFile(filePath string, globID string, serverMessages chan<- string) CatFile { return CatFile{ readFile: readFile{ filePath: filePath, @@ -17,7 +15,6 @@ func NewCatFile(filePath string, globID string, serverMessages chan<- string, retry: false, canSkipLines: false, seekEOF: false, - limiter: limiter, }, } } -- cgit v1.2.3