openstack/aodh
Code Issues Proposed changes

Correctly output the sample content in the file publisher

Browse Source 
This fixes bug #1224190.

Change-Id: I4faf06febac0eb7e1663ef2c68763930c19ca6a4
This commit is contained in:
Lianhao Lu 2013-09-12 14:36:54 +08:00
parent 234e10cd64
commit f8036386bd
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceilometer/publisher/file.py
View File

@ -93,4 +93,5 @@ class FilePublisher(publisher.PublisherBase):
:param samples: Samples from pipeline after transformation :param samples: Samples from pipeline after transformation
""" """
if self.publisher_logger: if self.publisher_logger:
self.publisher_logger.info(samples) for sample in samples:
self.publisher_logger.info(sample.as_dict())

31
tests/publisher/test_file.py
View File

@ -66,10 +66,10 @@ class TestFilePublisher(base.TestCase):
), ),
] ]
def test_file_publisher(self): def test_file_publisher_maxbytes(self):
# Test valid configurations # Test valid configurations
parsed_url = urlsplit( name = '%s/log_file' % self.tempdir.path
'file:///tmp/log_file?max_bytes=50&backup_count=3') parsed_url = urlsplit('file://%s?max_bytes=50&backup_count=3' % name)
publisher = file.FilePublisher(parsed_url) publisher = file.FilePublisher(parsed_url)
publisher.publish_samples(None, publisher.publish_samples(None,
self.test_data) self.test_data)
@ -79,13 +79,14 @@ class TestFilePublisher(base.TestCase):
logging.handlers.RotatingFileHandler)) logging.handlers.RotatingFileHandler))
self.assertEqual([handler.maxBytes, handler.baseFilename, self.assertEqual([handler.maxBytes, handler.baseFilename,
handler.backupCount], handler.backupCount],
[50, '/tmp/log_file', 3]) [50, name, 3])
# The rotating file gets created since only allow 50 bytes. # The rotating file gets created since only allow 50 bytes.
self.assertTrue(os.path.exists('/tmp/log_file.1')) self.assertTrue(os.path.exists('%s.1' % name))
def test_file_publisher(self):
# Test missing max bytes, backup count configurations # Test missing max bytes, backup count configurations
parsed_url = urlsplit( name = '%s/log_file_plain' % self.tempdir.path
'file:///tmp/log_file_plain') parsed_url = urlsplit('file://%s' % name)
publisher = file.FilePublisher(parsed_url) publisher = file.FilePublisher(parsed_url)
publisher.publish_samples(None, publisher.publish_samples(None,
self.test_data) self.test_data)
@ -95,14 +96,20 @@ class TestFilePublisher(base.TestCase):
logging.handlers.RotatingFileHandler)) logging.handlers.RotatingFileHandler))
self.assertEqual([handler.maxBytes, handler.baseFilename, self.assertEqual([handler.maxBytes, handler.baseFilename,
handler.backupCount], handler.backupCount],
[0, '/tmp/log_file_plain', 0]) [0, name, 0])
# Test the content is corrected saved in the file
# The rotating file gets created since only allow 50 bytes. self.assertTrue(os.path.exists(name))
self.assertTrue(os.path.exists('/tmp/log_file_plain')) with open(name, 'r') as f:
content = f.read()
for sample in self.test_data:
self.assertTrue(sample.id in content)
self.assertTrue(sample.timestamp in content)
def test_file_publisher_invalid(self):
# Test invalid max bytes, backup count configurations # Test invalid max bytes, backup count configurations
parsed_url = urlsplit( parsed_url = urlsplit(
'file:///tmp/log_file_bad?max_bytes=yus&backup_count=5y') 'file://%s/log_file_bad'
'?max_bytes=yus&backup_count=5y' % self.tempdir.path)
publisher = file.FilePublisher(parsed_url) publisher = file.FilePublisher(parsed_url)
publisher.publish_samples(None, publisher.publish_samples(None,
self.test_data) self.test_data)