Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't pass 'done' as it is unneeded #2318

Merged
merged 1 commit into from
Apr 16, 2015
Merged

Don't pass 'done' as it is unneeded #2318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### Bugfixes
- [#2297](https://github.com/influxdb/influxdb/pull/2297): create /var/run during startup. Thanks @neonstalwart.
- [#2312](https://github.com/influxdb/influxdb/pull/2312): Re-use httpclient for continuous queries
- [#2318](https://github.com/influxdb/influxdb/pull/2318): Remove pointless use of 'done' channel for collectd.

## v0.9.0-rc25 [2015-04-15]

Expand Down
4 changes: 2 additions & 2 deletions collectd/collectd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ func ListenAndServe(s *Server, iface string) error {
s.conn = conn

s.wg.Add(1)
go s.serve(s.done)
go s.serve()

return nil
}

func (s *Server) serve(done chan struct{}) {
func (s *Server) serve() {
defer s.wg.Done()

// From https://collectd.org/wiki/index.php/Binary_protocol
Expand Down