rgw: pubsub: adjust event encoding

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/rgw/rgw_sync_module_pubsub.cc b/src/rgw/rgw_sync_module_pubsub.cc
index 98124e33b82085436f4195b3b9dd9fd1c772a0c2..1e82c3bae5d99f6188b77aad7886e39cfc0d1c86 100644 (file)
--- a/src/rgw/rgw_sync_module_pubsub.cc
+++ b/src/rgw/rgw_sync_module_pubsub.cc
@@ -351,8 +351,17 @@ struct objstore_event {
   }
 
   void dump(Formatter *f) const {
-    encode_json("bucket", bucket, f);
-    encode_json("key", key, f);
+    {
+      Formatter::ObjectSection s(*f, "bucket");
+      encode_json("name", bucket.name, f);
+      encode_json("tenant", bucket.tenant, f);
+      encode_json("bucket_id", bucket.bucket_id, f);
+    }
+    {
+      Formatter::ObjectSection s(*f, "key");
+      encode_json("name", key.name, f);
+      encode_json("instance", key.instance, f);
+    }
     utime_t mt(mtime);
     encode_json("mtime", mt, f);
     Formatter::ObjectSection s(*f, "attrs");