"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "monasca_log_api/config.py" between
monasca-log-api-2.7.0.tar.gz and monasca-log-api-2.9.0.tar.gz

About: OpenStack Monasca Log API is a RESTful API server acting as gateway for logs collected from log-agents.
The "Stein" series (maintained release).

config.py  (monasca-log-api-2.7.0):config.py  (monasca-log-api-2.9.0)
skipping to change at line 17 skipping to change at line 17
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import sys import sys
from oslo_config import cfg
from oslo_log import log from oslo_log import log
from oslo_policy import opts as policy_opts from oslo_policy import opts as policy_opts
from monasca_log_api import conf from monasca_log_api import conf
from monasca_log_api import version from monasca_log_api import version
CONF = conf.CONF CONF = conf.CONF
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
_CONF_LOADED = False _CONF_LOADED = False
_GUNICORN_MARKER = 'gunicorn' _GUNICORN_MARKER = 'gunicorn'
def _is_running_under_gunicorn(): def _is_running_under_gunicorn():
"""Evaluates if api runs under gunicorn""" """Evaluates if api runs under gunicorn"""
content = filter(lambda x: x != sys.executable and _GUNICORN_MARKER in x, content = filter(lambda x: x != sys.executable and _GUNICORN_MARKER in x,
sys.argv or []) sys.argv or [])
return len(list(content) if not isinstance(content, list) else content) > 0 return len(list(content) if not isinstance(content, list) else content) > 0
def get_config_files():
"""Get the possible configuration files accepted by oslo.config
This also includes the deprecated ones
"""
# default files
conf_files = cfg.find_config_files(project='monasca',
prog='monasca-log-api')
# deprecated config files (only used if standard config files are not there)
if len(conf_files) == 0:
old_conf_files = cfg.find_config_files(project='monasca',
prog='log-api')
if len(old_conf_files) > 0:
LOG.warning('Found deprecated old location "{}" '
'of main configuration file'.format(old_conf_files))
conf_files += old_conf_files
return conf_files
def parse_args(argv=None): def parse_args(argv=None):
global _CONF_LOADED global _CONF_LOADED
if _CONF_LOADED: if _CONF_LOADED:
LOG.debug('Configuration has been already loaded') LOG.debug('Configuration has been already loaded')
return return
log.set_defaults() log.set_defaults()
log.register_options(CONF) log.register_options(CONF)
argv = (argv if argv is not None else sys.argv[1:]) argv = (argv if argv is not None else sys.argv[1:])
args = ([] if _is_running_under_gunicorn() else argv or []) args = ([] if _is_running_under_gunicorn() else argv or [])
CONF(args=args, CONF(args=args,
prog='log-api', prog=sys.argv[1:],
project='monasca', project='monasca',
version=version.version_str, version=version.version_str,
default_config_files=get_config_files(),
description='RESTful API to collect log files') description='RESTful API to collect log files')
log.setup(CONF, log.setup(CONF,
product_name='monasca-log-api', product_name='monasca-log-api',
version=version.version_str) version=version.version_str)
conf.register_opts() conf.register_opts()
policy_opts.set_defaults(CONF) policy_opts.set_defaults(CONF)
_CONF_LOADED = True _CONF_LOADED = True
 End of changes. 4 change blocks. 
1 lines changed or deleted 21 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)