Skip to content

Commit

Permalink
Riemann output: remove some of the object referencing/dereferencing
Browse files Browse the repository at this point in the history
closes #378
closes #379
  • Loading branch information
sparrc committed Nov 18, 2015
1 parent a8294c2 commit a3feddd
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
## v0.2.3 [unreleased]

### Release Notes
- Riemann output added

### Features
- [#379](https://github.com/influxdb/telegraf/pull/379): Riemann output, thanks @allenj!

### Bugfixes

## v0.2.2 [2015-11-18]

### Release Notes
Expand Down
15 changes: 7 additions & 8 deletions outputs/riemann/riemann.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type Riemann struct {
URL string
Transport string

client raidman.Client
client *raidman.Client
}

var sampleConfig = `
Expand All @@ -31,7 +31,7 @@ func (r *Riemann) Connect() error {
return err
}

r.client = *c
r.client = c
return nil
}

Expand All @@ -56,7 +56,7 @@ func (r *Riemann) Write(points []*client.Point) error {
var events []*raidman.Event
for _, p := range points {
ev := buildEvent(p)
events = append(events, &ev)
events = append(events, ev)
}

var senderr = r.client.SendMulti(events)
Expand All @@ -68,10 +68,9 @@ func (r *Riemann) Write(points []*client.Point) error {
return nil
}

func buildEvent(p *client.Point) raidman.Event {
host := p.Tags()["host"]

if len(host) == 0 {
func buildEvent(p *client.Point) *raidman.Event {
host, ok := p.Tags()["host"]
if !ok {
hostname, err := os.Hostname()
if err != nil {
host = "unknown"
Expand All @@ -86,7 +85,7 @@ func buildEvent(p *client.Point) raidman.Event {
Metric: p.Fields()["value"],
}

return *event
return event
}

func init() {
Expand Down

0 comments on commit a3feddd

Please sign in to comment.