Consolidate version location

This commit is contained in:
Stephen McQuay 2018-03-08 14:48:25 -08:00
parent eee330aea5
commit a4987f4f42
Signed by: sm
GPG Key ID: 4E4B72F479BA3CE5
4 changed files with 7 additions and 9 deletions

View File

@ -13,8 +13,6 @@ import (
"mcquay.me/metrics" "mcquay.me/metrics"
) )
const version = "v0.1.1"
type v struct { type v struct {
Hostname string `json:"hostname"` Hostname string `json:"hostname"`
V string `json:"version"` V string `json:"version"`
@ -33,7 +31,7 @@ func main() {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
r := v{ r := v{
Hostname: hn, Hostname: hn,
V: version, V: hw.Version,
} }
if err := json.NewEncoder(w).Encode(r); err != nil { if err := json.NewEncoder(w).Encode(r); err != nil {
log.Printf("json: %+v", err) log.Printf("json: %+v", err)

View File

@ -15,8 +15,6 @@ import (
"mcquay.me/metrics" "mcquay.me/metrics"
) )
const version = "v0.1.1"
var success *prometheus.CounterVec var success *prometheus.CounterVec
type v struct { type v struct {
@ -90,7 +88,7 @@ func main() {
fetcher := state{ fetcher := state{
Hostname: hn, Hostname: hn,
V: version, V: hw.Version,
Counts: map[string]int{}, Counts: map[string]int{},
} }
go fetcher.update(target) go fetcher.update(target)

View File

@ -3,13 +3,13 @@ package main
import ( import (
"log" "log"
"time" "time"
)
const version = "v0.1.1" "mcquay.me/hw"
)
func main() { func main() {
for { for {
log.Printf("hwl@%+v", version) log.Printf("hwl@%+v", hw.Version)
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
} }
} }

2
hw.go
View File

@ -2,5 +2,7 @@ package hw
import "net/http" import "net/http"
const Version = "v0.1.2"
// OK simply return 200 // OK simply return 200
func OK(w http.ResponseWriter, req *http.Request) {} func OK(w http.ResponseWriter, req *http.Request) {}