diff --git a/swift/common/utils.py b/swift/common/utils.py index 6a28d53b31..624e299633 100644 --- a/swift/common/utils.py +++ b/swift/common/utils.py @@ -2400,6 +2400,9 @@ def get_logger(conf, name=None, log_to_console=False, log_route=None, :param fmt: Override log format :return: an instance of ``LogAdapter`` """ + # note: log_name is typically specified in conf (i.e. defined by + # operators), whereas log_route is typically hard-coded in callers of + # get_logger (i.e. defined by developers) if not conf: conf = {} if name is None: diff --git a/swift/container/sync.py b/swift/container/sync.py index 4c50bf7bd6..874edccd71 100644 --- a/swift/container/sync.py +++ b/swift/container/sync.py @@ -51,52 +51,24 @@ from swift.common.middleware.versioned_writes.object_versioning import ( # requiring deployment of the new /etc/swift/internal-client.conf ic_conf_body = """ [DEFAULT] -# swift_dir = /etc/swift -# user = swift -# You can specify default log routing here if you want: -# log_name = swift -# log_facility = LOG_LOCAL0 -# log_level = INFO -# log_address = /dev/log -# -# comma separated list of functions to call to setup custom log handlers. -# functions get passed: conf, name, log_to_console, log_route, fmt, logger, -# adapted_logger -# log_custom_handlers = -# -# If set, log_udp_host will override log_address -# log_udp_host = -# log_udp_port = 514 -# -# You can enable StatsD logging here: -# log_statsd_host = -# log_statsd_port = 8125 -# log_statsd_default_sample_rate = 1.0 -# log_statsd_sample_rate_factor = 1.0 -# log_statsd_metric_prefix = - [pipeline:main] pipeline = catch_errors proxy-logging cache symlink proxy-server [app:proxy-server] use = egg:swift#proxy account_autocreate = true -# See proxy-server.conf-sample for options [filter:symlink] use = egg:swift#symlink -# See proxy-server.conf-sample for options [filter:cache] use = egg:swift#memcache -# See proxy-server.conf-sample for options [filter:proxy-logging] use = egg:swift#proxy_logging [filter:catch_errors] use = egg:swift#catch_errors -# See proxy-server.conf-sample for options """.lstrip()