
This patch uses cfg.CONF as ConfigOpts in common/config instead of creating a new instance of it. This is needed since most of Oslo's modules use the global CONF object to register their config parameters. The patch also moves log.setup call into Bootstrap and calls it after configs are loaded. Fixes bug: #1190524 Change-Id: Ib601418a7dbcad84c79b640b93bc5798ec4a62c4
34 lines
942 B
Python
34 lines
942 B
Python
# Copyright (c) 2013 Red Hat, 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 sys
|
|
|
|
from marconi import bootstrap
|
|
|
|
|
|
def fail(returncode, e):
|
|
sys.stderr.write("ERROR: %s\n" % e)
|
|
sys.exit(returncode)
|
|
|
|
|
|
def run():
|
|
try:
|
|
server = bootstrap.Bootstrap(cli_args=sys.argv[1:])
|
|
server.run()
|
|
except KeyboardInterrupt:
|
|
fail(1, '... terminating marconi')
|
|
except RuntimeError as e:
|
|
fail(1, e)
|