From cfc6ce6b0dd07cd8d1ec3a16c57d92d8a977bbe2 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 3 Oct 2016 14:06:40 -0400 Subject: [PATCH] rgw: add commas to hostname output std::accumulate() was appending hostnames without commas or spaces Signed-off-by: Casey Bodley (cherry picked from commit 2d6efe88fd7242d60d388958699745302560bceb) --- src/rgw/rgw_rest.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc index 623034810a12..1feb8fe556b4 100644 --- a/src/rgw/rgw_rest.cc +++ b/src/rgw/rgw_rest.cc @@ -208,8 +208,7 @@ void rgw_rest_init(CephContext *cct, RGWRados *store, RGWZoneGroup& zone_group) hostnames_set.insert(cct->_conf->rgw_dns_name); hostnames_set.insert(zone_group.hostnames.begin(), zone_group.hostnames.end()); hostnames_set.erase(""); // filter out empty hostnames - string s; - ldout(cct, 20) << "RGW hostnames: " << std::accumulate(hostnames_set.begin(), hostnames_set.end(), s) << dendl; + ldout(cct, 20) << "RGW hostnames: " << hostnames_set << dendl; /* TODO: We should have a sanity check that no hostname matches the end of * any other hostname, otherwise we will get ambigious results from * rgw_find_host_in_domains. @@ -223,8 +222,7 @@ void rgw_rest_init(CephContext *cct, RGWRados *store, RGWZoneGroup& zone_group) hostnames_s3website_set.insert(cct->_conf->rgw_dns_s3website_name); hostnames_s3website_set.insert(zone_group.hostnames_s3website.begin(), zone_group.hostnames_s3website.end()); hostnames_s3website_set.erase(""); // filter out empty hostnames - s.clear(); - ldout(cct, 20) << "RGW S3website hostnames: " << std::accumulate(hostnames_s3website_set.begin(), hostnames_s3website_set.end(), s) << dendl; + ldout(cct, 20) << "RGW S3website hostnames: " << hostnames_s3website_set << dendl; /* TODO: we should repeat the hostnames_set sanity check here * and ALSO decide about overlap, if any */ -- 2.47.3