nsqadmin: make importable

.gitignore

@@ -2,7 +2,7 @@
 build
 apps/nsqlookupd/nsqlookupd
 apps/nsqd/nsqd
-nsqadmin/nsqadmin
+apps/nsqadmin/nsqadmin
 bench/bench_reader/bench_reader
 bench/bench_writer/bench_writer
 bench/bench_channels/bench_channels

nsqadmin/main.go → apps/nsqadmin/main.go

@@ -12,6 +12,7 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/bitly/nsq/internal/app"
 	"github.com/bitly/nsq/internal/version"
+	"github.com/bitly/nsq/nsqadmin"
 	"github.com/mreiferson/go-options"
 )
 
@@ -70,9 +71,9 @@ func main() {
 		}
 	}
 
-	opts := NewNSQAdminOptions()
+	opts := nsqadmin.NewNSQAdminOptions()
 	options.Resolve(opts, flagSet, cfg)
-	nsqadmin := NewNSQAdmin(opts)
+	nsqadmin := nsqadmin.NewNSQAdmin(opts)
 
 	nsqadmin.Main()
 	<-exitChan

nsqadmin/context.go

@@ -1,4 +1,4 @@
-package main
+package nsqadmin
 
 type Context struct {
 	nsqadmin *NSQAdmin

nsqadmin/graphs.go

@@ -1,4 +1,4 @@
-package main
+package nsqadmin
 
 import (
 	"encoding/json"
@@ -193,7 +193,7 @@ func (g *GraphOptions) Sparkline(gr GraphTarget, key string) template.URL {
 	params.Set("lineMode", "connected")
 	params.Set("drawNullAsZero", "false")
 
-	interval := fmt.Sprintf("%dsec", *statsdInterval/time.Second)
+	interval := fmt.Sprintf("%dsec", g.ctx.nsqadmin.opts.StatsdInterval/time.Second)
 	targets, color := gr.Target(key)
 	for _, target := range targets {
 		target = fmt.Sprintf(target, g.Prefix(gr.Host(), metricType(key)))
@@ -216,13 +216,13 @@ func (g *GraphOptions) LargeGraph(gr GraphTarget, key string) template.URL {
 	params.Set("lineMode", "connected")
 	params.Set("drawNullAsZero", "false")
 
-	interval := fmt.Sprintf("%dsec", *statsdInterval/time.Second)
+	interval := fmt.Sprintf("%dsec", g.ctx.nsqadmin.opts.StatsdInterval/time.Second)
 	targets, color := gr.Target(key)
 	for _, target := range targets {
 		target = fmt.Sprintf(target, g.Prefix(gr.Host(), metricType(key)))
 		target = fmt.Sprintf(`summarize(%s,"%s","avg")`, target, interval)
 		if metricType(key) == "counter" {
-			scale := fmt.Sprintf("%.04f", 1/float64(*statsdInterval/time.Second))
+			scale := fmt.Sprintf("%.04f", 1/float64(g.ctx.nsqadmin.opts.StatsdInterval/time.Second))
 			target = fmt.Sprintf(`scale(%s,%s)`, target, scale)
 		}
 		params.Add("target", target)
@@ -257,18 +257,18 @@ func metricType(key string) string {
 	}[key]
 }
 
-func rateQuery(target string) string {
+func rateQuery(target string, statsdInterval time.Duration) string {
 	params := url.Values{}
-	fromInterval := fmt.Sprintf("-%dsec", *statsdInterval*2/time.Second)
+	fromInterval := fmt.Sprintf("-%dsec", statsdInterval*2/time.Second)
 	params.Set("from", fromInterval)
-	untilInterval := fmt.Sprintf("-%dsec", *statsdInterval/time.Second)
+	untilInterval := fmt.Sprintf("-%dsec", statsdInterval/time.Second)
 	params.Set("until", untilInterval)
 	params.Set("format", "json")
 	params.Set("target", target)
 	return fmt.Sprintf("/render?%s", params.Encode())
 }
 
-func parseRateResponse(body []byte) ([]byte, error) {
+func parseRateResponse(body []byte, statsdInterval time.Duration) ([]byte, error) {
 	js, err := simplejson.NewJson([]byte(body))
 	if err != nil {
 		return nil, err
@@ -284,7 +284,7 @@ func parseRateResponse(body []byte) ([]byte, error) {
 	if rate < 0 {
 		rateStr = "N/A"
 	} else {
-		rateDivisor := *statsdInterval / time.Second
+		rateDivisor := statsdInterval / time.Second
 		rateStr = fmt.Sprintf("%.2f", rate/float64(rateDivisor))
 	}
 	return json.Marshal(map[string]string{"datapoint": rateStr})

nsqadmin/http.go

@@ -1,4 +1,4 @@
-package main
+package nsqadmin
 
 import (
 	"fmt"
@@ -979,20 +979,13 @@ func (s *httpServer) graphiteDataHandler(w http.ResponseWriter, req *http.Reques
 		return
 	}
 
-	var queryFunc func(string) string
-	var formatJSONResponseFunc func([]byte) ([]byte, error)
-
-	switch metric {
-	case "rate":
-		queryFunc = rateQuery
-		formatJSONResponseFunc = parseRateResponse
-	default:
+	if metric != "rate" {
 		s.ctx.nsqadmin.logf("ERROR: unknown metric value %s", metric)
 		http.Error(w, "INVALID_METRIC_PARAM", 500)
 		return
 	}
 
-	query := queryFunc(target)
+	query := rateQuery(target, s.ctx.nsqadmin.opts.StatsdInterval)
 	url := s.ctx.nsqadmin.opts.GraphiteURL + query
 	s.ctx.nsqadmin.logf("GRAPHITE: %s", url)
 	response, err := graphiteGet(url)
@@ -1002,7 +995,7 @@ func (s *httpServer) graphiteDataHandler(w http.ResponseWriter, req *http.Reques
 		return
 	}
 
-	resp, err := formatJSONResponseFunc(response)
+	resp, err := parseRateResponse(response, s.ctx.nsqadmin.opts.StatsdInterval)
 	if err != nil {
 		s.ctx.nsqadmin.logf("ERROR: response formating failed - %s", err)
 		http.Error(w, "INVALID_GRAPHITE_RESPONSE", 500)

nsqadmin/logger.go

@@ -1,4 +1,4 @@
-package main
+package nsqadmin
 
 type logger interface {
 	Output(maxdepth int, s string) error

nsqadmin/notify.go

@@ -1,4 +1,4 @@
-package main
+package nsqadmin
 
 import (
 	"encoding/base64"

nsqadmin/nsqadmin.go

@@ -1,4 +1,4 @@
-package main
+package nsqadmin
 
 import (
 	"bytes"
@@ -72,7 +72,7 @@ func NewNSQAdmin(opts *nsqadminOptions) *NSQAdmin {
 		n.graphiteURL = url
 	}
 
-	n.logf(version.String("nsqlookupd"))
+	n.logf(version.String("nsqadmin"))
 
 	return n
 }
@@ -91,8 +91,8 @@ func (n *NSQAdmin) handleAdminActions() {
 			n.logf("ERROR: failed to serialize admin action - %s", err)
 		}
 		httpclient := &http.Client{Transport: http_api.NewDeadlineTransport(10 * time.Second)}
-		n.logf("POSTing notification to %s", *notificationHTTPEndpoint)
-		_, err = httpclient.Post(*notificationHTTPEndpoint, "application/json", bytes.NewBuffer(content))
+		n.logf("POSTing notification to %s", n.opts.NotificationHTTPEndpoint)
+		_, err = httpclient.Post(n.opts.NotificationHTTPEndpoint, "application/json", bytes.NewBuffer(content))
 		if err != nil {
 			n.logf("ERROR: failed to POST notification - %s", err)
 		}

nsqadmin/options.go

@@ -1,4 +1,4 @@
-package main
+package nsqadmin
 
 import (
 	"log"