From 33502aeee2ab78c62dbe0583185c5bf6d0e56cad Mon Sep 17 00:00:00 2001 From: Yahav Itzhak Date: Thu, 12 Oct 2023 14:36:37 +0300 Subject: [PATCH] Transfer - Improve the graceful stop mechanism (#991) --- artifactory/commands/transferfiles/phase.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/artifactory/commands/transferfiles/phase.go b/artifactory/commands/transferfiles/phase.go index df83e590f..d204c64d4 100644 --- a/artifactory/commands/transferfiles/phase.go +++ b/artifactory/commands/transferfiles/phase.go @@ -79,8 +79,8 @@ func (pb *phaseBase) StopGracefully() { pb.progressBar.StopGracefully() } if pb.pcDetails != nil { - pb.pcDetails.chunkBuilderProducerConsumer.Cancel() - pb.pcDetails.chunkUploaderProducerConsumer.Cancel() + pb.pcDetails.chunkBuilderProducerConsumer.Cancel(true) + pb.pcDetails.chunkUploaderProducerConsumer.Cancel(true) } } diff --git a/go.mod b/go.mod index 402dae770..dddbad02f 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/gookit/color v1.5.4 github.com/jedib0t/go-pretty/v6 v6.4.7 github.com/jfrog/build-info-go v1.9.12 - github.com/jfrog/gofrog v1.3.0 + github.com/jfrog/gofrog v1.3.1 github.com/jfrog/jfrog-apps-config v1.0.1 github.com/jfrog/jfrog-client-go v1.34.2 github.com/magiconair/properties v1.8.7 diff --git a/go.sum b/go.sum index b71ab42a5..953637904 100644 --- a/go.sum +++ b/go.sum @@ -197,8 +197,8 @@ github.com/jedib0t/go-pretty/v6 v6.4.7 h1:lwiTJr1DEkAgzljsUsORmWsVn5MQjt1BPJdPCt github.com/jedib0t/go-pretty/v6 v6.4.7/go.mod h1:Ndk3ase2CkQbXLLNf5QDHoYb6J9WtVfmHZu9n8rk2xs= github.com/jfrog/build-info-go v1.9.12 h1:EixG8LrRy1GN8oaYbmOcbqKDzsch5e7nUhk4Pwb+BAQ= github.com/jfrog/build-info-go v1.9.12/go.mod h1:ujJ8XQZMdT2tMkLSMJNyDd1pCY+duwHdjV+9or9FLIg= -github.com/jfrog/gofrog v1.3.0 h1:o4zgsBZE4QyDbz2M7D4K6fXPTBJht+8lE87mS9bw7Gk= -github.com/jfrog/gofrog v1.3.0/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0= +github.com/jfrog/gofrog v1.3.1 h1:QqAwQXCVReT724uga1AYqG/ZyrNQ6f+iTxmzkb+YFQk= +github.com/jfrog/gofrog v1.3.1/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0= github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY= github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-client-go v1.34.2 h1:qTER8oaBS04R3nx8flfXODz5GPyk3dIVvQxl3DSYGKc=