05edab3661
Previously oslo.messaging's MessageHandlingServer was used as as a murano-engine service in service launcher. As a result it's wait() method was called. But after recent changes it's wait method is supposed to be call only after stop() to wait for graceful message processing to end. As a result a warning was printed that stop() didn't finish after 30 sec from wait() invocation (because it was never called). This commit adds EngineService service implementation that has its own wait() and encapsulates MessageHandlingServer instance. Change-Id: Ie553e0b27cc1c261b963907b4f12f89795b99a12 Closes-Bug: #1521087
61 lines
1.7 KiB
Python
61 lines
1.7 KiB
Python
#!/usr/bin/env python
|
|
#
|
|
# Copyright (c) 2013 Mirantis, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import os
|
|
import sys
|
|
|
|
import eventlet
|
|
|
|
from oslo_log import log as logging
|
|
from oslo_service import service
|
|
|
|
from murano.common import config
|
|
from murano.common import engine
|
|
|
|
CONF = config.CONF
|
|
|
|
|
|
if os.name == 'nt':
|
|
# eventlet monkey patching causes subprocess.Popen to fail on Windows
|
|
# when using pipes due to missing non blocking I/O support
|
|
eventlet.monkey_patch(os=False)
|
|
else:
|
|
eventlet.monkey_patch()
|
|
|
|
# If ../murano/__init__.py exists, add ../ to Python search path, so that
|
|
# it will override what happens to be installed in /usr/(local/)lib/python...
|
|
root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir)
|
|
if os.path.exists(os.path.join(root, 'murano', '__init__.py')):
|
|
sys.path.insert(0, root)
|
|
|
|
|
|
def main():
|
|
try:
|
|
config.parse_args()
|
|
|
|
logging.setup(CONF, 'murano')
|
|
launcher = service.ServiceLauncher(CONF)
|
|
launcher.launch_service(engine.EngineService())
|
|
|
|
launcher.wait()
|
|
except RuntimeError as e:
|
|
sys.stderr.write("ERROR: %s\n" % e)
|
|
sys.exit(1)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|