From a9253242776c4ec4a2bdebb790fd602f01796fca Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Wed, 21 Sep 2016 21:48:11 +0200 Subject: [PATCH] rgw: improve debug printing in browser upload of S3 and Swift. Signed-off-by: Radoslaw Zarzynski --- src/rgw/rgw_rest_s3.cc | 23 ++++++++++++----------- src/rgw/rgw_rest_swift.cc | 15 +++++++++------ 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index fc21e746f634a..80ca50e1f6f8c 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -1538,17 +1538,18 @@ int RGWPostObj_ObjStore_S3::get_params() return r; if (s->cct->_conf->subsys.should_gather(ceph_subsys_rgw, 20)) { - map::iterator piter; - for (piter = part.fields.begin(); piter != part.fields.end(); ++piter) { - ldout(s->cct, 20) << "read part header: name=" << part.name << dendl; - ldout(s->cct, 20) << "name=" << piter->first << dendl; - ldout(s->cct, 20) << "val=" << piter->second.val << dendl; - ldout(s->cct, 20) << "params:" << dendl; - map& params = piter->second.params; - for (const auto& pair : params) { - ldout(s->cct, 20) << " " << pair.first << " -> " << pair.second - << dendl; - } + ldout(s->cct, 20) << "read part header -- part.name=" + << part.name << dendl; + + for (const auto& pair : part.fields) { + ldout(s->cct, 20) << "field.name=" << pair.first << dendl; + ldout(s->cct, 20) << "field.val=" << pair.second.val << dendl; + ldout(s->cct, 20) << "field.params:" << dendl; + + for (const auto& param_pair : pair.second.params) { + ldout(s->cct, 20) << " " << param_pair.first + << " -> " << param_pair.second << dendl; + } } } diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc index 98938e4d05e1a..1ed87c6cb1afe 100644 --- a/src/rgw/rgw_rest_swift.cc +++ b/src/rgw/rgw_rest_swift.cc @@ -1820,15 +1820,18 @@ int RGWFormPost::get_params() } if (s->cct->_conf->subsys.should_gather(ceph_subsys_rgw, 20)) { + ldout(s->cct, 20) << "read part header -- part.name=" + << part.name << dendl; + for (const auto& pair : part.fields) { - ldout(s->cct, 20) << "read part header: partname=" << part.name << dendl; - ldout(s->cct, 20) << "name=" << pair.first << dendl; - ldout(s->cct, 20) << "val=" << pair.second.val << dendl; - ldout(s->cct, 20) << "params:" << dendl; + ldout(s->cct, 20) << "field.name=" << pair.first << dendl; + ldout(s->cct, 20) << "field.val=" << pair.second.val << dendl; + ldout(s->cct, 20) << "field.params:" << dendl; + for (const auto& param_pair : pair.second.params) { - ldout(s->cct, 20) << " " << param_pair.first + ldout(s->cct, 20) << " " << param_pair.first << " -> " << param_pair.second << dendl; - } + } } } -- 2.39.5