rgw: improve debug printing in browser upload of S3 and Swift.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index fc21e746f634a0729d8997a1886eae4bf757d491..80ca50e1f6f8c554a2ef94b61684156166c392e4 100644 (file)
--- 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<string, struct post_part_field, ltstr_nocase>::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<string, string>& 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 98938e4d05e1ac53ac24862751fb1008a883ed34..1ed87c6cb1afe36ae27a0b36f8f60c01188b537e 100644 (file)
--- 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;
-       }
+        }
       }
     }