x/swift3
Code Issues Proposed changes

Add optional item, log_name into proxy-server.conf-sample

Browse Source 
And also swift3 middleare log name can be configured as well as
s3token middleware.

Change-Id: I882208579e8df89ebd0033033e1e035c370b80a6
Related-Change: be22c9d2fd2a8a93e8c6745e9ca18adc649f704a
This commit is contained in:
Kota Tsuyuzaki 2017-08-30 14:20:38 +09:00
parent be22c9d2fd
commit 3a9851747c
3 changed files with 9 additions and 5 deletions

10
etc/proxy-server.conf-sample

@ -121,6 +121,8 @@ use = egg:swift3#swift3
# upload, except the last part. # upload, except the last part.
min_segment_size = 5242880 min_segment_size = 5242880
# log_name = swift3
[filter:catch_errors] [filter:catch_errors]
use = egg:swift#catch_errors use = egg:swift#catch_errors
@ -158,9 +160,11 @@ auth_uri = http://keystonehost:35357/
http_timeout = 10.0 http_timeout = 10.0
# SSL-related options # SSL-related options
#insecure = False # insecure = False
#certfile = # certfile =
#keyfile = # keyfile =
# log_name = s3token
[filter:authtoken] [filter:authtoken]
# See swift manual for more details. # See swift manual for more details.

2
swift3/middleware.py

@ -181,7 +181,7 @@ def filter_factory(global_conf, **local_conf):
# Reassign config to logger # Reassign config to logger
global LOGGER global LOGGER
LOGGER = get_logger(CONF, log_route='swift3') LOGGER = get_logger(CONF, log_route=CONF.get('log_name', 'swift3'))
register_swift_info( register_swift_info(
'swift3', 'swift3',

2
swift3/s3_token_middleware.py

@ -119,7 +119,7 @@ class S3Token(object):
"""Common initialization code.""" """Common initialization code."""
self._app = app self._app = app
self._logger = get_logger( self._logger = get_logger(
conf, log_route=conf.get('log_name', __name__)) conf, log_route=conf.get('log_name', 's3token'))
self._logger.debug('Starting the %s component', PROTOCOL_NAME) self._logger.debug('Starting the %s component', PROTOCOL_NAME)
self._timeout = float(conf.get('http_timeout', '10.0')) self._timeout = float(conf.get('http_timeout', '10.0'))
if not (0 < self._timeout <= 60): if not (0 < self._timeout <= 60):