Skip to content

server.py now allows empty string prefix #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

server.py now allows empty string prefix #88

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97777fa
server.py now allows empty string prefix
ronan-ln Oct 5, 2014
aa32c57
server.py - Fixed the global_prefix initialisation
ronan-ln Oct 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions pystatsd/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ def _clean_key(k):



TIMER_MSG = '''%(prefix)s.%(key)s.lower %(min)s %(ts)s
%(prefix)s.%(key)s.count %(count)s %(ts)s
%(prefix)s.%(key)s.mean %(mean)s %(ts)s
%(prefix)s.%(key)s.upper %(max)s %(ts)s
%(prefix)s.%(key)s.upper_%(pct_threshold)s %(max_threshold)s %(ts)s
TIMER_MSG = '''%(prefix)s%(key)s.lower %(min)s %(ts)s
%(prefix)s%(key)s.count %(count)s %(ts)s
%(prefix)s%(key)s.mean %(mean)s %(ts)s
%(prefix)s%(key)s.upper %(max)s %(ts)s
%(prefix)s%(key)s.upper_%(pct_threshold)s %(max_threshold)s %(ts)s
'''


Expand Down Expand Up @@ -74,13 +74,13 @@ def __init__(self, pct_threshold=90, debug=False, transport='graphite',
self.graphite_host = graphite_host
self.graphite_port = graphite_port
self.no_aggregate_counters = no_aggregate_counters
self.counters_prefix = counters_prefix
self.timers_prefix = timers_prefix
self.counters_prefix = counters_prefix + '.' if counters_prefix else ''
self.timers_prefix = timers_prefix + '.' if timers_prefix else ''
self.debug = debug
self.expire = expire

# For services like Hosted Graphite, etc.
self.global_prefix = global_prefix
self.global_prefix = global_prefix + '.' if global_prefix else ''

self.counters = {}
self.timers = {}
Expand Down Expand Up @@ -169,7 +169,7 @@ def flush(self):
print("Sending %s => count=%s" % (k, v))

if self.transport == 'graphite':
msg = '%s.%s %s %s\n' % (self.counters_prefix, k, v, ts)
msg = '%s%s %s %s\n' % (self.counters_prefix, k, v, ts)
stat_string += msg
elif self.transport == 'ganglia':
# We put counters in _counters group. Underscore is to make sure counters show up
Expand All @@ -195,7 +195,7 @@ def flush(self):

if self.transport == 'graphite':
# note: counters and gauges implicitly end up in the same namespace
msg = '%s.%s %s %s\n' % (self.counters_prefix, k, v, ts)
msg = '%s%s %s %s\n' % (self.counters_prefix, k, v, ts)
stat_string += msg
elif self.transport == 'ganglia':
g.send(k, v, "double", "count", "both", 60, self.dmax, "_gauges", self.ganglia_spoof_host)
Expand Down Expand Up @@ -275,7 +275,7 @@ def flush(self):
# Prepend stats with Hosted Graphite API key if necessary
if self.global_prefix:
stat_string = '\n'.join([
'%s.%s' % (self.global_prefix, s) for s in stat_string.split('\n')[:-1]
'%s%s' % (self.global_prefix, s) for s in stat_string.split('\n')[:-1]
])

graphite = socket.socket()
Expand Down