dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

address code review comments re. style/structure

This commit is contained in:
ncohensm 2016-07-08 09:55:30 -07:00
parent 5866acd48d
commit 6da73ded58
1 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/inputs/http_listener/http_listener.go
View File

@ -61,13 +61,19 @@ func (t *HttpListener) Start(acc telegraf.Accumulator) error {
t.acc = acc t.acc = acc
var rawListener, err = net.Listen("tcp", t.ServiceAddress) var rawListener, err = net.Listen("tcp", t.ServiceAddress)
if err != nil {
return err
}
t.listener, err = stoppableListener.New(rawListener) t.listener, err = stoppableListener.New(rawListener)
if err != nil {
return err
}
go t.httpListen() go t.httpListen()
log.Printf("Started HTTP listener service on %s\n", t.ServiceAddress) log.Printf("Started HTTP listener service on %s\n", t.ServiceAddress)
return err return nil
} }
// Stop cleans up all resources // Stop cleans up all resources
@ -85,7 +91,13 @@ func (t *HttpListener) Stop() {
func (t *HttpListener) httpListen() error { func (t *HttpListener) httpListen() error {
readTimeout, err := strconv.ParseInt(t.ReadTimeout, 10, 32) readTimeout, err := strconv.ParseInt(t.ReadTimeout, 10, 32)
if err != nil {
return err
}
writeTimeout, err := strconv.ParseInt(t.WriteTimeout, 10, 32) writeTimeout, err := strconv.ParseInt(t.WriteTimeout, 10, 32)
if err != nil {
return err
}
var server = http.Server{ var server = http.Server{
Handler: t, Handler: t,
@ -93,15 +105,18 @@ func (t *HttpListener) httpListen() error {
WriteTimeout: time.Duration(writeTimeout) * time.Second, WriteTimeout: time.Duration(writeTimeout) * time.Second,
} }
err = server.Serve(t.listener) return server.Serve(t.listener)
return err
} }
func (t *HttpListener) ServeHTTP(res http.ResponseWriter, req *http.Request) { func (t *HttpListener) ServeHTTP(res http.ResponseWriter, req *http.Request) {
body, err := ioutil.ReadAll(req.Body) body, err := ioutil.ReadAll(req.Body)
if err == nil { if err != nil {
log.Printf("Problem reading request: [%s], Error: %s\n", string(body), err)
res.WriteHeader(http.StatusInternalServerError)
res.Write([]byte("ERROR reading request"))
}
var path = req.URL.Path[1:] var path = req.URL.Path[1:]
if path == "write" { if path == "write" {
@ -127,11 +142,6 @@ func (t *HttpListener) ServeHTTP(res http.ResponseWriter, req *http.Request) {
res.WriteHeader(http.StatusNotFound) res.WriteHeader(http.StatusNotFound)
res.Write([]byte("Not Found")) res.Write([]byte("Not Found"))
} }
} else {
log.Printf("Problem reading request: [%s], Error: %s\n", string(body), err)
res.WriteHeader(http.StatusInternalServerError)
res.Write([]byte("ERROR reading request"))
}
} }
func (t *HttpListener) storeMetrics(metrics []telegraf.Metric) error { func (t *HttpListener) storeMetrics(metrics []telegraf.Metric) error {