External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 14:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix up statsd work to support python 2.6

Browse Source 
Format specifiers must include field specifier
This commit is contained in:
Matthew Jones
2016-02-02 09:58:19 -05:00
parent 3982f34392
commit 5d21ad5ae6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/lib/metrics.py
View File

@@ -11,10 +11,10 @@ logger = logging.getLogger(__name__)
def task_timer(fn): def task_timer(fn):
@wraps(fn) @wraps(fn)
def __wrapped__(self, *args, **kwargs): def __wrapped__(self, *args, **kwargs):
statsd.incr('tasks.{}.{}.count'.format( statsd.incr('tasks.{0}.{1}.count'.format(
self.name.rsplit('.', 1)[-1], self.name.rsplit('.', 1)[-1],
fn.__name__)) fn.__name__))
with statsd.timer('tasks.{}.{}.timer'.format( with statsd.timer('tasks.{0}.{1}.timer'.format(
self.name.rsplit('.', 1)[-1], self.name.rsplit('.', 1)[-1],
fn.__name__)): fn.__name__)):
return fn(self, *args, **kwargs) return fn(self, *args, **kwargs)
@@ -25,16 +25,16 @@ class BaseTimer(object):
def __init__(self, name, prefix=None): def __init__(self, name, prefix=None):
self.name = name.rsplit('.', 1)[-1] self.name = name.rsplit('.', 1)[-1]
if prefix: if prefix:
self.name = '{}.{}'.format(prefix, self.name) self.name = '{0}.{1}'.format(prefix, self.name)
def __call__(self, fn): def __call__(self, fn):
@wraps(fn) @wraps(fn)
def __wrapped__(obj, *args, **kwargs): def __wrapped__(obj, *args, **kwargs):
statsd.incr('{}.{}.count'.format( statsd.incr('{0}.{1}.count'.format(
self.name, self.name,
fn.__name__ fn.__name__
)) ))
with statsd.timer('{}.{}.timer'.format( with statsd.timer('{0}.{1}.timer'.format(
self.name, self.name,
fn.__name__ fn.__name__
)): )):