Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2318 from influxdb/no_need_for_done 

Don't pass 'done' as it is unneeded
pull/2246/merge
Philip O'Toole 2015-04-16 16:30:55 -07:00
parent 2d1e809fe6 2162be59e9
commit 033ab7aa21
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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]

4
collectd/collectd.go
View File

@ -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