github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 01:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use levelled logging

Browse Source
This commit is contained in:
Alfonso Acosta
2016-02-08 12:00:10 +00:00
parent 6240187333
commit 8c3c8994b1
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
probe/endpoint/procspy/background_reader_linux.go
View File

@@ -3,11 +3,12 @@ package procspy
import (
"bytes"
"fmt"
"log"
"math"
"sync"
"time"
log "github.com/Sirupsen/logrus"
"github.com/weaveworks/scope/probe/process"
)
@@ -28,8 +29,6 @@ type backgroundReader struct {
readySockets map[uint64]*Proc
}
// starts a rate-limited background goroutine to read the expensive files from
// proc.
func newBackgroundReader(walker process.Walker) *backgroundReader {
br := &backgroundReader{
walker: walker,
@@ -39,6 +38,8 @@ func newBackgroundReader(walker process.Walker) *backgroundReader {
return br
}
// starts a rate-limited background goroutine to read the expensive files from
// proc.
func (br *backgroundReader) start() error {
br.mtx.Lock()
defer br.mtx.Unlock()
@@ -72,7 +73,7 @@ func (br *backgroundReader) loop() {
start := time.Now()
sockets, err := walkProcPid(br.walkingBuf, br.walker, ticker.C, fdBlockSize)
if err != nil {
log.Printf("background reader: error walking /proc: %s\n", err)
log.Errorf("background /proc reader: error walking /proc: %s", err)
continue
}
@@ -96,10 +97,10 @@ func (br *backgroundReader) loop() {
walkTime := time.Now().Sub(start)
walkTimeF := float64(walkTime)
log.Printf("debug: background reader: full pass took %s\n", walkTime)
log.Debugf("background /proc reader: full pass took %s", walkTime)
if walkTimeF/targetWalkTimeF > 1.5 {
log.Printf(
"warn: background reader: full pass took %s: 50%% more than expected (%s)\n",
log.Warnf(
"background /proc reader: full pass took %s: 50%% more than expected (%s)",
walkTime,
targetWalkTime,
)
@@ -108,7 +109,7 @@ func (br *backgroundReader) loop() {
// Adjust rate limit to more-accurately meet the target walk time in next iteration
scaledRateLimit := targetWalkTimeF / walkTimeF * float64(rateLimit)
rateLimit = time.Duration(math.Min(scaledRateLimit, maxRateLimitF))
log.Printf("debug: background reader: new rate limit %s\n", rateLimit)
log.Debugf("background /proc reader: new rate limit %s", rateLimit)
ticker.Stop()
ticker = time.NewTicker(rateLimit)

1
prog/probe.go
View File

@@ -24,6 +24,7 @@ import (
"github.com/weaveworks/scope/probe/controls"
"github.com/weaveworks/scope/probe/docker"
"github.com/weaveworks/scope/probe/endpoint"
"github.com/weaveworks/scope/probe/endpoint/procspy"
"github.com/weaveworks/scope/probe/host"
"github.com/weaveworks/scope/probe/kubernetes"
"github.com/weaveworks/scope/probe/overlay"