Skip to content

Commit

Permalink
Merge pull request #9230 from influxdata/js-remove-extraneous-newline…
Browse files Browse the repository at this point in the history
…s-from-log

Remove extraneous newlines from the log
  • Loading branch information
jsternberg authored Dec 15, 2017
2 parents 31f1ec2 + 5fcf57a commit b287c19
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
- [#9163](https://github.com/influxdata/influxdb/pull/9163): Fix race condition in the merge iterator close method.
- [#9144](https://github.com/influxdata/influxdb/issues/9144): Fix query compilation so multiple nested distinct calls is allowable
- [#8789](https://github.com/influxdata/influxdb/issues/8789): Fix CLI to allow quoted database names in use statement
- [#9208](https://github.com/influxdata/influxdb/pull/9208): Updated client 4xx error message when response body length is zero.
- [#9208](https://github.com/influxdata/influxdb/pull/9208): Updated client 4xx error message when response body length is zero.
- [#9230](https://github.com/influxdata/influxdb/pull/9230): Remove extraneous newlines from the log.

## v1.4.3 [unreleased]

Expand Down
8 changes: 4 additions & 4 deletions services/collectd/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func (s *Service) Open() error {
readdir = func(path string) {
files, err := ioutil.ReadDir(path)
if err != nil {
s.Logger.Info(fmt.Sprintf("Unable to read directory %s: %s\n", path, err))
s.Logger.Info(fmt.Sprintf("Unable to read directory %s: %s", path, err))
return
}

Expand All @@ -134,10 +134,10 @@ func (s *Service) Open() error {
continue
}

s.Logger.Info(fmt.Sprintf("Loading %s\n", fullpath))
s.Logger.Info(fmt.Sprintf("Loading %s", fullpath))
types, err := TypesDBFile(fullpath)
if err != nil {
s.Logger.Info(fmt.Sprintf("Unable to parse collectd types file: %s\n", f.Name()))
s.Logger.Info(fmt.Sprintf("Unable to parse collectd types file: %s", f.Name()))
continue
}

Expand All @@ -147,7 +147,7 @@ func (s *Service) Open() error {
readdir(s.Config.TypesDB)
s.popts.TypesDB = alltypesdb
} else {
s.Logger.Info(fmt.Sprintf("Loading %s\n", s.Config.TypesDB))
s.Logger.Info(fmt.Sprintf("Loading %s", s.Config.TypesDB))
types, err := TypesDBFile(s.Config.TypesDB)
if err != nil {
return fmt.Errorf("Open(): %s", err)
Expand Down
4 changes: 2 additions & 2 deletions services/continuous_querier/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ func (s *Service) ExecuteContinuousQuery(dbi *meta.DatabaseInfo, cqi *meta.Conti
}

if err := cq.q.SetTimeRange(startTime, endTime); err != nil {
s.Logger.Info(fmt.Sprintf("error setting time range: %s\n", err))
s.Logger.Info(fmt.Sprintf("error setting time range: %s", err))
return false, err
}

Expand All @@ -377,7 +377,7 @@ func (s *Service) ExecuteContinuousQuery(dbi *meta.DatabaseInfo, cqi *meta.Conti
// Do the actual processing of the query & writing of results.
res := s.runContinuousQueryAndWriteResult(cq)
if res.Err != nil {
s.Logger.Info(fmt.Sprintf("error: %s. running: %s\n", res.Err, cq.q.String()))
s.Logger.Info(fmt.Sprintf("error: %s. running: %s", res.Err, cq.q.String()))
return false, res.Err
}

Expand Down

0 comments on commit b287c19

Please sign in to comment.