Commit 35c6d5b5ccae0e25533f5bcb6dce25bbf1df68c9 - golang-github-vbauerster-mpb

drop debug log.Logger, write to debugOut directly Vladimir Bauer 4 years ago

2 changed file(s) with 24 addition(s) and 19 deletion(s). Raw diff Collapse all Expand all

-12

bar.go less more

4	4	"context"
5	5	"fmt"
6	6	"io"
7		"log"
8	7	"runtime/debug"
9	8	"strings"
10	9	"sync"

35	34	cacheState *bState
36	35
37	36	container *Progress
38		dlogger *log.Logger
39	37	recoveredPanic interface{}
40	38	}
41	39

80	78	}
81	79
82	80	func newBar(container Progress, bs bState) *Bar {
83		logPrefix := fmt.Sprintf("%sbar#%02d ", container.dlogger.Prefix(), bs.id)
84	81	ctx, cancel := context.WithCancel(container.ctx)
85	82
86	83	bar := &Bar{

92	89	frameCh: make(chan *frame, 1),
93	90	done: make(chan struct{}),
94	91	cancel: cancel,
95		dlogger: log.New(bs.debugOut, logPrefix, log.Lshortfile),
96	92	}
97	93
98	94	go bar.serve(ctx, bs)

345	341	// recovering if user defined decorator panics for example
346	342	if p := recover(); p != nil {
347	343	if b.recoveredPanic == nil {
	344	if s.debugOut != nil {
	345	fmt.Fprintln(s.debugOut, p)
	346	_, _ = s.debugOut.Write(debug.Stack())
	347	}
348	348	s.extender = makePanicExtender(p)
349	349	b.toShutdown = !b.toShutdown
350	350	b.recoveredPanic = p
351	351	}
352	352	reader, lines := s.extender(nil, s.reqWidth, stat)
353	353	b.frameCh <- &frame{reader, lines + 1}
354		b.dlogger.Println(p)
355	354	}
356	355	s.completeFlushed = s.completed
357	356	}()

558	557
559	558	func makePanicExtender(p interface{}) extenderFunc {
560	559	pstr := fmt.Sprint(p)
561		stack := debug.Stack()
562		stackLines := bytes.Count(stack, []byte("\n"))
563	560	return func(_ io.Reader, _ int, st decor.Statistics) (io.Reader, int) {
564	561	mr := io.MultiReader(
565	562	strings.NewReader(runewidth.Truncate(pstr, st.AvailableWidth, "…")),
566		strings.NewReader(fmt.Sprintf("\n%#v\n", st)),
567		bytes.NewReader(stack),
	563	strings.NewReader("\n"),
568	564	)
569		return mr, stackLines + 1
570		}
571		}
	565	return mr, 0
	566	}
	567	}

+16

-7

progress.go less more

5	5	"context"
6	6	"fmt"
7	7	"io"
8		"io/ioutil"
9		"log"
10	8	"math"
11	9	"os"
12	10	"sync"

32	30	done chan struct{}
33	31	refreshCh chan time.Time
34	32	once sync.Once
35		dlogger *log.Logger
36	33	}
37	34
38	35	// pState holds bars in its priorityQueue. It gets passed to

74	71	rr: prr,
75	72	parkedBars: make(map[Bar]Bar),
76	73	output: os.Stdout,
77		debugOut: ioutil.Discard,
78	74	}
79	75
80	76	for _, opt := range options {

90	86	bwg: new(sync.WaitGroup),
91	87	operateState: make(chan func(*pState)),
92	88	done: make(chan struct{}),
93		dlogger: log.New(s.debugOut, "[mpb] ", log.Lshortfile),
94	89	}
95	90
96	91	p.cwg.Add(1)

233	228	op(s)
234	229	case <-p.refreshCh:
235	230	if err := s.render(cw); err != nil {
236		p.dlogger.Println(err)
	231	if s.debugOut != nil {
	232	_, e := fmt.Fprintln(s.debugOut, err)
	233	if e != nil {
	234	panic(err)
	235	}
	236	} else {
	237	panic(err)
	238	}
237	239	}
238	240	case <-s.shutdownNotifier:
239	241	for s.heapUpdated {
240	242	if err := s.render(cw); err != nil {
241		p.dlogger.Println(err)
	243	if s.debugOut != nil {
	244	_, e := fmt.Fprintln(s.debugOut, err)
	245	if e != nil {
	246	panic(err)
	247	}
	248	} else {
	249	panic(err)
	250	}
242	251	}
243	252	}
244	253	return