github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #290 from prometheus/fix/go-vet 

Minor "go tool vet" cleanups
pull/289/merge
juliusv 2013-06-07 06:52:48 -07:00
parent 615972dd01 558281890b
commit 95400cb785
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retrieval/format/processor0_0_1_test.go
View File

@ -131,7 +131,7 @@ func testProcessor001Process(t test.Tester) {
reader, err := os.Open(path.Join("fixtures", scenario.in)) reader, err := os.Open(path.Join("fixtures", scenario.in))
if err != nil { if err != nil {
t.Fatalf("%d. couldn't open scenario input file %s: %s", scenario.in, err) t.Fatalf("%d. couldn't open scenario input file %s: %s", i, scenario.in, err)
} }
err = Processor001.Process(reader, time.Now(), scenario.baseLabels, inputChannel) err = Processor001.Process(reader, time.Now(), scenario.baseLabels, inputChannel)

2
retrieval/format/processor0_0_2_test.go
View File

@ -131,7 +131,7 @@ func testProcessor002Process(t test.Tester) {
reader, err := os.Open(path.Join("fixtures", scenario.in)) reader, err := os.Open(path.Join("fixtures", scenario.in))
if err != nil { if err != nil {
t.Fatalf("%d. couldn't open scenario input file %s: %s", scenario.in, err) t.Fatalf("%d. couldn't open scenario input file %s: %s", i, scenario.in, err)
} }
err = Processor002.Process(reader, time.Now(), scenario.baseLabels, inputChannel) err = Processor002.Process(reader, time.Now(), scenario.baseLabels, inputChannel)

1
storage/metric/tiered.go
View File

@ -217,7 +217,6 @@ func (t *TieredStorage) Serve(started chan<- bool) {
t.mu.Lock() t.mu.Lock()
if t.state != tieredStorageStarting { if t.state != tieredStorageStarting {
panic("Illegal State: Attempted to restart TieredStorage.") panic("Illegal State: Attempted to restart TieredStorage.")
return
} }
t.state = tieredStorageServing t.state = tieredStorageServing