summaryrefslogtreecommitdiffstats
path: root/src/rgw
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@redhat.com>2015-09-10 22:14:40 +0200
committerYehuda Sadeh <yehuda@redhat.com>2015-09-10 22:14:40 +0200
commitfa94ca4ed0e82c2b457cbbc686efe5ec34420a25 (patch)
tree16ce01f53145a37f7936020156d7e98558a9a71b /src/rgw
parentMerge pull request #5859 from jecluis/wip-test-mon-ping (diff)
parentrgw: include RequestId as part of the Error response (diff)
downloadceph-fa94ca4ed0e82c2b457cbbc686efe5ec34420a25.tar.xz
ceph-fa94ca4ed0e82c2b457cbbc686efe5ec34420a25.zip
Merge pull request #5866 from jmunhoz/wip-requestid-on-error
rgw: include RequestId as part of the Error response Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Diffstat (limited to 'src/rgw')
-rw-r--r--src/rgw/rgw_rest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index b7f51970d09..e2b1568247c 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -553,6 +553,8 @@ void end_header(struct req_state *s, RGWOp *op, const char *content_type, const
s->formatter->dump_string("Code", s->err.s3_code);
if (!s->err.message.empty())
s->formatter->dump_string("Message", s->err.message);
+ if (!s->trans_id.empty())
+ s->formatter->dump_string("RequestId", s->trans_id);
s->formatter->close_section();
dump_content_length(s, s->formatter->get_len());
} else {