mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 07:34:04 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #227 from prometheus/fix/build-errors

Browse source 
Fix build errors and add default build step to "make".
This commit is contained in:
juliusv 2013-05-07 06:55:05 -07:00
parent 984fd7c184 af7920126c
commit 6551356af4
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -15,7 +15,7 @@ TEST_ARTIFACTS = prometheus search_index
include Makefile.INCLUDE include Makefile.INCLUDE
all: test all: binary test
advice: advice:
go tool vet . go tool vet .

1
main.go
View file

@ -19,7 +19,6 @@ import (
"github.com/prometheus/prometheus/retrieval" "github.com/prometheus/prometheus/retrieval"
"github.com/prometheus/prometheus/retrieval/format" "github.com/prometheus/prometheus/retrieval/format"
"github.com/prometheus/prometheus/rules" "github.com/prometheus/prometheus/rules"
"github.com/prometheus/prometheus/rules/ast"
"github.com/prometheus/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"github.com/prometheus/prometheus/web" "github.com/prometheus/prometheus/web"
"github.com/prometheus/prometheus/web/api" "github.com/prometheus/prometheus/web/api"

2
web/status.go
View file

@ -32,12 +32,12 @@ type PrometheusStatus struct {
} }
type StatusHandler struct { type StatusHandler struct {
sync.Mutex
BuildInfo map[string]string BuildInfo map[string]string
Config *config.Config Config *config.Config
CurationState chan metric.CurationState CurationState chan metric.CurationState
PrometheusStatus *PrometheusStatus PrometheusStatus *PrometheusStatus
TargetManager retrieval.TargetManager TargetManager retrieval.TargetManager
mutex sync.Mutex
} }
func (h *StatusHandler) ServeRequestsForever() { func (h *StatusHandler) ServeRequestsForever() {