Skip to content

Commit

Permalink
Merge pull request #32883 from papertigers/mz-fix-carbon-returner
Browse files Browse the repository at this point in the history
mode should default to 'text'
  • Loading branch information
Nicole Thomas committed Apr 27, 2016
2 parents a146dd2 + a30b058 commit 20864cb
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions salt/returners/carbon_return.py
Expand Up @@ -230,8 +230,7 @@ def _send(saltdata, metric_base, opts):
port = opts.get('port')
skip = opts.get('skip')
metric_base_pattern = opts.get('carbon.metric_base_pattern')
if 'mode' in opts:
mode = opts.get('mode').lower()
mode = opts.get('mode').lower() if 'mode' in opts else 'text'

log.debug('Carbon minion configured with host: {0}:{1}'.format(host, port))
log.debug('Using carbon protocol: {0}'.format(mode))
Expand Down

0 comments on commit 20864cb

Please sign in to comment.