ef9d5247e9
oslo.i18n has recently been released. This patch switches marconi over oslo.i18n. As per oslo.i18n's instructions, a new i18n module has been added under marconi. This module defines the translation globals and imports the necessary functions from oslo.i18n. The patch doesn't change the way Marconi does translation, this means that a `_` function is still being injected to the builtins. Note that the gettextutils module is still a required module from oslo-inc because there are oslo-inc modules that depend on the old gettextutils module. Closes-bug: #1314300 Change-Id: Ifb8f3296d1a0e2483ebd1c8d868b7359ecc99fb5
55 lines
1.4 KiB
Python
55 lines
1.4 KiB
Python
# Copyright (c) 2013 Rackspace Hosting, 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.
|
|
|
|
from __future__ import print_function
|
|
import functools
|
|
import sys
|
|
|
|
from marconi.i18n import _
|
|
from marconi.openstack.common import log as logging
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
def _fail(returncode, ex):
|
|
"""Handles terminal errors.
|
|
|
|
:param returncode: process return code to pass to sys.exit
|
|
:param ex: the error that occurred
|
|
"""
|
|
|
|
LOG.exception(ex)
|
|
sys.exit(returncode)
|
|
|
|
|
|
def runnable(func):
|
|
"""Entry point wrapper.
|
|
|
|
Note: This call blocks until the process is killed
|
|
or interrupted.
|
|
"""
|
|
|
|
@functools.wraps(func)
|
|
def _wrapper():
|
|
try:
|
|
logging.setup('marconi')
|
|
func()
|
|
except KeyboardInterrupt:
|
|
LOG.info(_(u'Terminating'))
|
|
except Exception as ex:
|
|
_fail(1, ex)
|
|
|
|
return _wrapper
|