summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Burry <bburry@etsy.com>2015-09-09 11:18:47 -0700
committerBen Burry <bburry@etsy.com>2015-11-13 17:34:42 +0000
commitb17227668d7f8fea2a69a7f4d509f8a167c06bfb (patch)
treea702ce3492087cadde44fbfc4027c5d9f1e06c99
parentaf42233f8da119fe0565b7d313705e6d64b6a3c3 (diff)
downloadlogster-b17227668d7f8fea2a69a7f4d509f8a167c06bfb.zip
logster-b17227668d7f8fea2a69a7f4d509f8a167c06bfb.tar.gz
logster-b17227668d7f8fea2a69a7f4d509f8a167c06bfb.tar.bz2
Bug fixes in graphite and statsd output
-rw-r--r--logster/outputs/GraphiteOutput.py3
-rw-r--r--logster/outputs/StatsdOutput.py5
2 files changed, 6 insertions, 2 deletions
diff --git a/logster/outputs/GraphiteOutput.py b/logster/outputs/GraphiteOutput.py
index fb7c7f5..c2ff501 100644
--- a/logster/outputs/GraphiteOutput.py
+++ b/logster/outputs/GraphiteOutput.py
@@ -1,4 +1,5 @@
from logster.logster_helper import LogsterOutput
+import re
import socket
@@ -48,7 +49,7 @@ class GraphiteOutput(LogsterOutput):
self.logger.debug("Submitting Graphite metric: %s" % metric_string)
if (not self.dry_run):
- s.sendall(bytes("%s\n" % metric_string))
+ s.sendall(bytes("%s\n" % metric_string, 'ascii'))
else:
print("%s %s" % (self.graphite_host, metric_string))
finally:
diff --git a/logster/outputs/StatsdOutput.py b/logster/outputs/StatsdOutput.py
index d4c7453..64cd2f8 100644
--- a/logster/outputs/StatsdOutput.py
+++ b/logster/outputs/StatsdOutput.py
@@ -14,6 +14,9 @@ class StatsdOutput(LogsterOutput):
def __init__(self, parser, options, logger):
super(StatsdOutput, self).__init__(parser, options, logger)
+ if not options.statsd_host:
+ parser.print_help()
+ parser.error("You must supply --statsd-host when using 'statsd' as an output type.")
self.statsd_host = options.statsd_host
@@ -28,6 +31,6 @@ class StatsdOutput(LogsterOutput):
if (not self.dry_run):
udp_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
- udp_sock.sendto(metric_string, (host[0], int(host[1])))
+ udp_sock.sendto(bytes(metric_string, 'ascii'), (host[0], int(host[1])))
else:
print("%s %s" % (self.statsd_host, metric_string))