diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample index 64e150b5..35734284 100644 --- a/etc/proxy-server.conf-sample +++ b/etc/proxy-server.conf-sample @@ -121,6 +121,8 @@ use = egg:swift3#swift3 # upload, except the last part. min_segment_size = 5242880 +# log_name = swift3 + [filter:catch_errors] use = egg:swift#catch_errors @@ -158,9 +160,11 @@ auth_uri = http://keystonehost:35357/ http_timeout = 10.0 # SSL-related options -#insecure = False -#certfile = -#keyfile = +# insecure = False +# certfile = +# keyfile = + +# log_name = s3token [filter:authtoken] # See swift manual for more details. diff --git a/swift3/middleware.py b/swift3/middleware.py index afbb4c9b..1153d274 100644 --- a/swift3/middleware.py +++ b/swift3/middleware.py @@ -181,7 +181,7 @@ def filter_factory(global_conf, **local_conf): # Reassign config to logger global LOGGER - LOGGER = get_logger(CONF, log_route='swift3') + LOGGER = get_logger(CONF, log_route=CONF.get('log_name', 'swift3')) register_swift_info( 'swift3', diff --git a/swift3/s3_token_middleware.py b/swift3/s3_token_middleware.py index 41919d38..f86c5ce6 100644 --- a/swift3/s3_token_middleware.py +++ b/swift3/s3_token_middleware.py @@ -119,7 +119,7 @@ class S3Token(object): """Common initialization code.""" self._app = app 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._timeout = float(conf.get('http_timeout', '10.0')) if not (0 < self._timeout <= 60):