Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
// Version numbers
var majorVersion = 0
var minorVersion = 10
var patchVersion = 2
var patchVersion = 3

// Version string
var version = fmt.Sprintf("%d.%d.%d", majorVersion, minorVersion, patchVersion)
12 changes: 8 additions & 4 deletions transfers/mover.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,15 @@ func (m *moverState) process(decoder *gob.Decoder) {
for running {
select {
case transferId := <-m.Channels.RequestMove:
moves, err := m.moveFiles(transferId)
if err == nil {
moveOperations[transferId] = moves
if _, found := moveOperations[transferId]; !found {
moves, err := m.moveFiles(transferId)
if err == nil {
moveOperations[transferId] = moves
}
m.Channels.Error <- err
} else {
m.Channels.Error <- fmt.Errorf("file move for transfer %s previously requested", transferId.String())
}
m.Channels.Error <- err
case transferId := <-m.Channels.RequestCancellation:
if moves, found := moveOperations[transferId]; found {
err := m.cancel(moves)
Expand Down
10 changes: 4 additions & 6 deletions transfers/stager.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,11 @@ func (s *stagerState) updateStatus(transferId uuid.UUID, staging stagingEntry) (
if err != nil {
slog.Error(err.Error())
}

}
}

if newStatus.Code == TransferStatusActive {
if err := mover.MoveFiles(transferId); err != nil {
return completed, err
if newStatus.Code == TransferStatusActive {
if err := mover.MoveFiles(transferId); err != nil {
return completed, err
}
}
}
return completed, nil
Expand Down
Loading