diff --git a/fileTransfer/manager.go b/fileTransfer/manager.go index 751d5e412fdf0bc5cf0d7f5acc7713f510b5f31c..ffa38dd6de7fb8c5c2f14014d82a01109d05cbb2 100644 --- a/fileTransfer/manager.go +++ b/fileTransfer/manager.go @@ -215,14 +215,17 @@ 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 - multiStoppable := stoppable.NewMulti(fileTransferStoppable) + senderPoolStop := stoppable.NewMulti(workerPoolStoppable) batchBuilderStop := stoppable.NewSingle(batchBuilderThreadStoppable) // Start sending threads - go m.startSendingWorkerPool(multiStoppable) + m.startSendingWorkerPool(senderPoolStop) go m.batchBuilderThread(batchBuilderStop) // Create a multi stoppable + multiStoppable := stoppable.NewMulti(fileTransferStoppable) + jww.DEBUG.Printf("Adding sender pool w/ name %s", senderPoolStop.Name()) + multiStoppable.Add(senderPoolStop) multiStoppable.Add(batchBuilderStop) return multiStoppable, nil diff --git a/fileTransfer/send.go b/fileTransfer/send.go index eea7c9f18c63b747e82554e2ddaaf58c09a32fa5..00e41955e0db7a02459737a740bcf5afe2babf7a 100644 --- a/fileTransfer/send.go +++ b/fileTransfer/send.go @@ -65,6 +65,8 @@ func (m *manager) startSendingWorkerPool(multiStop *stoppable.Multi) { go m.sendingThread(stop) multiStop.Add(stop) } + + jww.DEBUG.Printf("startSendingWorkerPool multi after adding all: %v", multiStop) } // sendingThread sends part packets that become available oin the send queue.