Merge pull request ceph#50350 from BBoozmen/oozmen_rgw_beast_log_bucket_name

cbodley · web-flow · commit 5e4e058a7362 · 2023-10-02T15:39:11.000+01:00
rgw/logging: add bucket and object names to the log line for ops-log

Reviewed-by: Casey Bodley &lt;cbodley@redhat.com&gt;
diff --git a/src/rgw/rgw_log.cc b/src/rgw/rgw_log.cc
@@ -251,6 +251,7 @@ void rgw_format_ops_log_entry(struct rgw_log_entry& entry, Formatter *formatter)
 {
   formatter->open_object_section("log_entry");
   formatter->dump_string("bucket", entry.bucket);
+  formatter->dump_string("object", entry.obj.name);
   {
     auto t = utime_t{entry.time};
     t.gmtime(formatter->dump_stream("time"));      // UTC

Original file line number	Diff line number	Diff line change
`@@ -251,6 +251,7 @@ void rgw_format_ops_log_entry(struct rgw_log_entry& entry, Formatter *formatter)`
`251`	`251`	`{`
`252`	`252`	`formatter->open_object_section("log_entry");`
`253`	`253`	`formatter->dump_string("bucket", entry.bucket);`
	`254`	`+ formatter->dump_string("object", entry.obj.name);`
`254`	`255`	`{`
`255`	`256`	`auto t = utime_t{entry.time};`
`256`	`257`	`t.gmtime(formatter->dump_stream("time")); // UTC`