stackforge/libra
Code Issues Proposed changes

Worker stats should be longs not ints.

Browse Source 
Change-Id: I2acb08d8de924a127c34e0667eea19c836066e98
This commit is contained in:
David Shrewsbury 2012-11-27 10:22:03 -05:00
parent 3a6daeaea0
commit af6bc02041
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libra/common/lbstats.py
View File

@ -20,8 +20,8 @@ class LBStatistics(object):
def __init__(self): def __init__(self):
self.stats = {} self.stats = {}
self.bytes_out = 0 self.bytes_out = 0L
self.bytes_in = 0 self.bytes_in = 0L
self.utc_timestamp = datetime.datetime.utcnow() self.utc_timestamp = datetime.datetime.utcnow()
@property @property
@ -30,8 +30,8 @@ class LBStatistics(object):
@bytes_out.setter @bytes_out.setter
def bytes_out(self, value): def bytes_out(self, value):
if not isinstance(value, int): if not isinstance(value, long):
raise TypeError("Must be an integer: '%s'" % value) raise TypeError("Must be a long integer: '%s'" % value)
self.stats['bytes_out'] = value self.stats['bytes_out'] = value
@property @property
@ -40,8 +40,8 @@ class LBStatistics(object):
@bytes_in.setter @bytes_in.setter
def bytes_in(self, value): def bytes_in(self, value):
if not isinstance(value, int): if not isinstance(value, long):
raise TypeError("Must be an integer: '%s'" % value) raise TypeError("Must be a long integer: '%s'" % value)
self.stats['bytes_in'] = value self.stats['bytes_in'] = value
@property @property

4
libra/worker/drivers/haproxy/ubuntu_services.py
View File

@ -143,9 +143,9 @@ class UbuntuServices(ServicesBase):
for row in reader: for row in reader:
if row['pxname'] == proxy_name and row['svname'] == service_name: if row['pxname'] == proxy_name and row['svname'] == service_name:
if row['bout']: if row['bout']:
stats.bytes_out = int(row['bout']) stats.bytes_out = long(row['bout'])
if row['bin']: if row['bin']:
stats.bytes_in = int(row['bin']) stats.bytes_in = long(row['bin'])
break break
return stats return stats

12
tests/test_lbstats.py
View File

@ -12,23 +12,23 @@ class TestLBStatistics(unittest.TestCase):
def testInitValues(self): def testInitValues(self):
now = datetime.datetime.utcnow() now = datetime.datetime.utcnow()
self.assertEquals(self.stats.bytes_out, 0)
self.assertEquals(self.stats.bytes_in, 0)
ts = self.stats.utc_timestamp ts = self.stats.utc_timestamp
self.assertEquals(ts.year, now.year) self.assertEquals(ts.year, now.year)
self.assertEquals(ts.month, now.month) self.assertEquals(ts.month, now.month)
self.assertEquals(ts.day, now.day) self.assertEquals(ts.day, now.day)
self.assertEquals(ts.hour, now.hour) self.assertEquals(ts.hour, now.hour)
self.assertEquals(self.stats.bytes_out, 0L)
self.assertEquals(self.stats.bytes_in, 0L)
def testSetBytesIn(self): def testSetBytesIn(self):
self.stats.bytes_in = 99 self.stats.bytes_in = 99L
self.assertEquals(self.stats.bytes_in, 99) self.assertEquals(self.stats.bytes_in, 99L)
with self.assertRaises(TypeError): with self.assertRaises(TypeError):
self.stats.bytes_in = "NaN" self.stats.bytes_in = "NaN"
def testSetBytesOut(self): def testSetBytesOut(self):
self.stats.bytes_out = 100 self.stats.bytes_out = 100L
self.assertEquals(self.stats.bytes_out, 100) self.assertEquals(self.stats.bytes_out, 100L)
with self.assertRaises(TypeError): with self.assertRaises(TypeError):
self.stats.bytes_out = "NaN" self.stats.bytes_out = "NaN"