Print error messagge 'unable to open database' to stderr

Fixes #610
This commit is contained in:
Andrey Smirnov
2017-08-09 00:01:51 +03:00
parent a626e4693b
commit e05768737f
3 changed files with 16 additions and 1 deletions
+2
View File
@@ -109,6 +109,8 @@ type Progress interface {
Printf(msg string, a ...interface{})
// ColoredPrintf does printf in colored way + newline
ColoredPrintf(msg string, a ...interface{})
// PrintfStdErr does printf but in safe manner to stderr
PrintfStdErr(msg string, a ...interface{})
}
// Downloader is parallel HTTP fetcher
+13
View File
@@ -2,6 +2,7 @@ package console
import (
"fmt"
"os"
"strings"
"github.com/cheggaaa/pb"
@@ -11,6 +12,7 @@ import (
const (
codePrint = iota
codePrintStdErr
codeProgress
codeHideProgress
codeStop
@@ -127,6 +129,11 @@ func (p *Progress) Printf(msg string, a ...interface{}) {
p.queue <- printTask{code: codePrint, message: fmt.Sprintf(msg, a...)}
}
// PrintfStdErr does printf but in safe manner to stderr
func (p *Progress) PrintfStdErr(msg string, a ...interface{}) {
p.queue <- printTask{code: codePrintStdErr, message: fmt.Sprintf(msg, a...)}
}
// ColoredPrintf does printf in colored way + newline
func (p *Progress) ColoredPrintf(msg string, a ...interface{}) {
if RunningOnTerminal() {
@@ -182,6 +189,12 @@ func (p *Progress) worker() {
p.barShown = false
}
fmt.Print(task.message)
case codePrintStdErr:
if p.barShown {
fmt.Print("\r\033[2K")
p.barShown = false
}
fmt.Fprint(os.Stderr, task.message)
case codeProgress:
if hasBar {
fmt.Print("\r" + task.message)
+1 -1
View File
@@ -262,7 +262,7 @@ func (context *AptlyContext) _database() (database.Storage, error) {
delay = time.Second
}
context._progress().Printf("Unable to open database, sleeping %s, attempts left %d...\n", delay, tries)
context._progress().PrintfStdErr("Unable to open database, sleeping %s, attempts left %d...\n", delay, tries)
time.Sleep(delay)
}
}