config.py (ec2-api-14.0.1) | : | config.py (ec2-api-15.0.0) | ||
---|---|---|---|---|
skipping to change at line 34 | skipping to change at line 34 | |||
_DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def('ec2api.sqlite') | _DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def('ec2api.sqlite') | |||
_DEFAULT_LOG_LEVELS = ['amqp=WARN', 'amqplib=WARN', 'boto=WARN', | _DEFAULT_LOG_LEVELS = ['amqp=WARN', 'amqplib=WARN', 'boto=WARN', | |||
'sqlalchemy=WARN', 'suds=INFO', | 'sqlalchemy=WARN', 'suds=INFO', | |||
'iso8601=WARN', | 'iso8601=WARN', | |||
'requests.packages.urllib3.connectionpool=WARN', | 'requests.packages.urllib3.connectionpool=WARN', | |||
'urllib3.connectionpool=WARN', 'websocket=WARN', | 'urllib3.connectionpool=WARN', 'websocket=WARN', | |||
'keystonemiddleware=WARN', 'routes.middleware=WARN', | 'keystonemiddleware=WARN', 'routes.middleware=WARN', | |||
'stevedore=WARN', 'keystoneclient.auth=WARN'] | 'stevedore=WARN', 'keystoneclient.auth=WARN'] | |||
_DEFAULT_LOGGING_CONTEXT_FORMAT = ('%(asctime)s.%(msecs)03d %(process)d ' | ||||
'%(levelname)s %(name)s [%(request_id)s ' | ||||
'%(user_identity)s] %(instance)s' | ||||
'%(message)s') | ||||
def parse_args(argv, default_config_files=None): | def parse_args(argv, default_config_files=None): | |||
log.set_defaults(_DEFAULT_LOGGING_CONTEXT_FORMAT, _DEFAULT_LOG_LEVELS) | log.set_defaults(default_log_levels=_DEFAULT_LOG_LEVELS) | |||
log.register_options(CONF) | log.register_options(CONF) | |||
options.set_defaults(CONF, connection=_DEFAULT_SQL_CONNECTION) | options.set_defaults(CONF, connection=_DEFAULT_SQL_CONNECTION) | |||
cfg.CONF(argv[1:], | cfg.CONF(argv[1:], | |||
project='ec2api', | project='ec2api', | |||
version=version.version_info.version_string(), | version=version.version_info.version_string(), | |||
default_config_files=default_config_files) | default_config_files=default_config_files) | |||
End of changes. 2 change blocks. | ||||
6 lines changed or deleted | 1 lines changed or added |