diff --git a/libra/common/lbstats.py b/libra/common/lbstats.py index 2c3d6b72..7b5b7f0e 100644 --- a/libra/common/lbstats.py +++ b/libra/common/lbstats.py @@ -20,8 +20,8 @@ class LBStatistics(object): def __init__(self): self.stats = {} - self.bytes_out = 0 - self.bytes_in = 0 + self.bytes_out = 0L + self.bytes_in = 0L self.utc_timestamp = datetime.datetime.utcnow() @property @@ -30,8 +30,8 @@ class LBStatistics(object): @bytes_out.setter def bytes_out(self, value): - if not isinstance(value, int): - raise TypeError("Must be an integer: '%s'" % value) + if not isinstance(value, long): + raise TypeError("Must be a long integer: '%s'" % value) self.stats['bytes_out'] = value @property @@ -40,8 +40,8 @@ class LBStatistics(object): @bytes_in.setter def bytes_in(self, value): - if not isinstance(value, int): - raise TypeError("Must be an integer: '%s'" % value) + if not isinstance(value, long): + raise TypeError("Must be a long integer: '%s'" % value) self.stats['bytes_in'] = value @property diff --git a/libra/worker/drivers/haproxy/ubuntu_services.py b/libra/worker/drivers/haproxy/ubuntu_services.py index 3bf65141..e0ca33d7 100644 --- a/libra/worker/drivers/haproxy/ubuntu_services.py +++ b/libra/worker/drivers/haproxy/ubuntu_services.py @@ -143,9 +143,9 @@ class UbuntuServices(ServicesBase): for row in reader: if row['pxname'] == proxy_name and row['svname'] == service_name: if row['bout']: - stats.bytes_out = int(row['bout']) + stats.bytes_out = long(row['bout']) if row['bin']: - stats.bytes_in = int(row['bin']) + stats.bytes_in = long(row['bin']) break return stats diff --git a/tests/test_lbstats.py b/tests/test_lbstats.py index aab676b3..c53f38c2 100644 --- a/tests/test_lbstats.py +++ b/tests/test_lbstats.py @@ -12,23 +12,23 @@ class TestLBStatistics(unittest.TestCase): def testInitValues(self): now = datetime.datetime.utcnow() - self.assertEquals(self.stats.bytes_out, 0) - self.assertEquals(self.stats.bytes_in, 0) ts = self.stats.utc_timestamp self.assertEquals(ts.year, now.year) self.assertEquals(ts.month, now.month) self.assertEquals(ts.day, now.day) self.assertEquals(ts.hour, now.hour) + self.assertEquals(self.stats.bytes_out, 0L) + self.assertEquals(self.stats.bytes_in, 0L) def testSetBytesIn(self): - self.stats.bytes_in = 99 - self.assertEquals(self.stats.bytes_in, 99) + self.stats.bytes_in = 99L + self.assertEquals(self.stats.bytes_in, 99L) with self.assertRaises(TypeError): self.stats.bytes_in = "NaN" def testSetBytesOut(self): - self.stats.bytes_out = 100 - self.assertEquals(self.stats.bytes_out, 100) + self.stats.bytes_out = 100L + self.assertEquals(self.stats.bytes_out, 100L) with self.assertRaises(TypeError): self.stats.bytes_out = "NaN"