4fdcbff967
This pulls in the latest gettextutils.py from oslo-incubator. The primary reason for this sync is to get commit 3d90045d2d1ce1df89f75937f415e3982e111063 which backports a change from the new i18n library to check lazy enablement at runtime. Adding this change makes it possible to remove the global enablement of lazy translation through gettextutils.install(). Instead we will use gettextutils.enable_lazy() with explicit imports of _() in each file where _() is used. The change to remove gettextutils.install() and to add the explicit _() imports will come in a dependent patch. Current HEAD in OSLO: -------------------- Merge: 3d90045d2d1ce1df89f75937f415e3982e111063 Date: Mon, 07 Jul 2014 17:55:18 +0000 Merge "Backport code for i18n to check lazy at runtime" -------------------- Additional changes being merged (newest to oldest): -------------------- de4adbc4 - pep8: fixed multiple violations 9912e5df - Add API for creating translation functions 6cc96d05 - Fix test_gettextutils on Python 3 -------------------- related - blueprint: i18n-enablement Change-Id: I4706b89b0b64c5816a1a022b6cd1dfa01b29b5dc
63 lines
1.9 KiB
Python
Executable File
63 lines
1.9 KiB
Python
Executable File
#!/usr/bin/env python
|
|
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
|
|
"""Starter script for Cinder OS API."""
|
|
|
|
import eventlet
|
|
eventlet.monkey_patch()
|
|
|
|
import os
|
|
import sys
|
|
import warnings
|
|
|
|
warnings.simplefilter('once', DeprecationWarning)
|
|
|
|
from oslo.config import cfg
|
|
|
|
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
|
|
os.pardir,
|
|
os.pardir))
|
|
if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")):
|
|
sys.path.insert(0, possible_topdir)
|
|
|
|
from cinder.openstack.common import gettextutils
|
|
gettextutils.install('cinder')
|
|
|
|
# Need to register global_opts
|
|
from cinder.common import config # noqa
|
|
from cinder.openstack.common import log as logging
|
|
from cinder import rpc
|
|
from cinder import service
|
|
from cinder import utils
|
|
from cinder import version
|
|
|
|
|
|
CONF = cfg.CONF
|
|
|
|
|
|
if __name__ == '__main__':
|
|
CONF(sys.argv[1:], project='cinder',
|
|
version=version.version_string())
|
|
logging.setup("cinder")
|
|
utils.monkey_patch()
|
|
|
|
rpc.init(CONF)
|
|
launcher = service.process_launcher()
|
|
server = service.WSGIService('osapi_volume')
|
|
launcher.launch_service(server, workers=server.workers)
|
|
launcher.wait()
|