Merge "clean up to use common service code"

This commit is contained in:
Jenkins 2015-02-10 12:29:08 +00:00 committed by Gerrit Code Review
commit ce34a4eae0
2 changed files with 4 additions and 10 deletions

View File

@ -21,8 +21,5 @@ from ceilometer import service
def main():
service.prepare_service()
launcher = os_service.ProcessLauncher()
launcher.launch_service(
notification.NotificationService(),
workers=service.get_workers('notification'))
launcher.wait()
os_service.launch(notification.NotificationService(),
workers=service.get_workers('notification')).wait()

View File

@ -21,8 +21,5 @@ from ceilometer import service
def main():
service.prepare_service()
launcher = os_service.ProcessLauncher()
launcher.launch_service(
collector.CollectorService(),
workers=service.get_workers('collector'))
launcher.wait()
os_service.launch(collector.CollectorService(),
workers=service.get_workers('collector')).wait()