diff --git a/fileTransfer/manager.go b/fileTransfer/manager.go index 7e167a3826cbd80ad8a848e74a500722e37be41a..751d5e412fdf0bc5cf0d7f5acc7713f510b5f31c 100644 --- a/fileTransfer/manager.go +++ b/fileTransfer/manager.go @@ -215,16 +215,14 @@ func NewManager(params Params, user FtE2e) (FileTransfer, error) { // StartProcesses starts the sending threads. Adheres to the xxdk.Service type. func (m *manager) StartProcesses() (stoppable.Stoppable, error) { // Construct stoppables - multiStop := stoppable.NewMulti(workerPoolStoppable) + multiStoppable := stoppable.NewMulti(fileTransferStoppable) batchBuilderStop := stoppable.NewSingle(batchBuilderThreadStoppable) // Start sending threads - go m.startSendingWorkerPool(multiStop) + go m.startSendingWorkerPool(multiStoppable) go m.batchBuilderThread(batchBuilderStop) // Create a multi stoppable - multiStoppable := stoppable.NewMulti(fileTransferStoppable) - multiStoppable.Add(multiStop) multiStoppable.Add(batchBuilderStop) return multiStoppable, nil diff --git a/fileTransfer/send.go b/fileTransfer/send.go index adb3df6e19396302f0482b9348cfdd46ab8dab83..a1de93becab5b72b95e01a3025134775e7cf9a39 100644 --- a/fileTransfer/send.go +++ b/fileTransfer/send.go @@ -63,7 +63,9 @@ func (m *manager) startSendingWorkerPool(multiStop *stoppable.Multi) { for i := 0; i < workerPoolThreads; i++ { stop := stoppable.NewSingle(sendThreadStoppableName + strconv.Itoa(i)) multiStop.Add(stop) - go m.sendingThread(stop) + go func(single *stoppable.Single) { + m.sendingThread(stop) + }(stop) } } @@ -74,8 +76,8 @@ func (m *manager) sendingThread(stop *stoppable.Single) { for { select { case <-stop.Quit(): - jww.DEBUG.Printf("[FT] Stopping file part sending thread: " + - "stoppable triggered.") + jww.DEBUG.Printf("[FT] Stopping file part sending thread (%s): "+ + "stoppable triggered.", stop.Name()) m.cmix.RemoveHealthCallback(healthChanID) stop.ToStopped() return diff --git a/stoppable/single.go b/stoppable/single.go index ea11ab42b586c3c1543509b5f575cda75f0cfca5..45451e5aacd0feb1dab01ca946d0f9c7400194ee 100644 --- a/stoppable/single.go +++ b/stoppable/single.go @@ -83,7 +83,7 @@ func (s *Single) ToStopped() { s.Name(), s.GetStatus(), Stopping) } - jww.TRACE.Printf("Switched status of single stoppable %q from %s to %s.", + jww.DEBUG.Printf("Switched status of single stoppable %q from %s to %s.", s.Name(), Stopping, Stopped) }