summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Burry <bburry@etsy.com>2015-09-06 07:33:48 -0700
committerBen Burry <bburry@etsy.com>2015-11-13 17:34:41 +0000
commit187dd71c27736f3daa84b8875b56c1e994737fa9 (patch)
tree6671f88f0eb698d919f72060a908675d704d64e3
parentc4192751d522f174535b1c6676d7874658a2d5df (diff)
downloadlogster-187dd71c27736f3daa84b8875b56c1e994737fa9.zip
logster-187dd71c27736f3daa84b8875b56c1e994737fa9.tar.gz
logster-187dd71c27736f3daa84b8875b56c1e994737fa9.tar.bz2
Consolidate metric name creation into output base class
-rw-r--r--logster/logster_helper.py17
1 files changed, 6 insertions, 11 deletions
diff --git a/logster/logster_helper.py b/logster/logster_helper.py
index d40dba6..372af98 100644
--- a/logster/logster_helper.py
+++ b/logster/logster_helper.py
@@ -54,15 +54,6 @@ class LockingError(Exception):
pass
-def build_metric_name(metric, prefix, suffix, separator):
- metric_name = metric.name
- if prefix:
- metric_name = prefix + separator + metric_name
- if suffix:
- metric_name = metric_name + separator + suffix
- return metric_name
-
-
class LogsterOutput(object):
def __init__(self, parser, options, logger):
self.options = options
@@ -70,6 +61,10 @@ class LogsterOutput(object):
self.dry_run = options.dry_run
def get_metric_name(self, metric, separator="."):
- build_metric_name(metric, self.options.metric_prefix,
- self.options.metric_suffix, separator)
+ metric_name = metric.name
+ if self.options.metric_prefix:
+ metric_name = self.options.metric_prefix + separator + metric_name
+ if self.options.metric_suffix:
+ metric_name = metric_name + separator + self.options.metric_suffix
+ return metric_name