MirrorSave
/
rclone
mirror of https://github.com/rclone/rclone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "cmd: shorten the locking window when using --progress to avoid deadlock" 

This reverts commit fdef567da6.

The problem turned out to be elsewhere.
This commit is contained in:
Nick Craig-Wood 2019-08-08 15:19:41 +01:00
parent 99b3154abd
commit 9d1fb2f4e7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/progress.go
View File

@ -84,6 +84,9 @@ var (
// printProgress prints the progress with an optional log // printProgress prints the progress with an optional log
func printProgress(logMessage string) { func printProgress(logMessage string) {
progressMu.Lock()
defer progressMu.Unlock()
var buf bytes.Buffer var buf bytes.Buffer
w, h, err := terminal.GetSize(int(os.Stdout.Fd())) w, h, err := terminal.GetSize(int(os.Stdout.Fd()))
if err != nil { if err != nil {
@ -97,10 +100,6 @@ func printProgress(logMessage string) {
buf.WriteString(s) buf.WriteString(s)
} }
// Lock from here to prevent terminal corruption
progressMu.Lock()
progressMu.Unlock()
if logMessage != "" { if logMessage != "" {
out("\n") out("\n")
out(moveUp) out(moveUp)