RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19678 from yaozongyou/rgw-civetweb-status-code

Browse Source 
rgw: log the right http status code in civetweb frontend's access log

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
This commit is contained in:
Yuri Weinstein 2018-01-08 08:51:35 -08:00 committed by GitHub
commit 26e174045f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/rgw/rgw_civetweb_frontend.cc
View File

@ -31,15 +31,20 @@ int RGWCivetWebFrontend::process(struct mg_connection* const conn)
RGWRestfulIO client_io(dout_context, &real_client_io);
RGWRequest req(env.store->get_new_req_id());
int http_ret = 0;
int ret = process_request(env.store, env.rest, &req, env.uri_prefix,
*env.auth_registry, &client_io, env.olog);
*env.auth_registry, &client_io, env.olog, &http_ret);
if (ret < 0) {
/* We don't really care about return code. */
dout(20) << "process_request() returned " << ret << dendl;
}
/* Mark as processed. */
return 1;
if (http_ret <= 0) {
/* Mark as processed. */
return 1;
}
return http_ret;
}
int RGWCivetWebFrontend::run()

11
src/rgw/rgw_process.cc
View File

@ -115,7 +115,8 @@ int process_request(RGWRados* const store,
const std::string& frontend_prefix,
const rgw_auth_registry_t& auth_registry,
RGWRestfulIO* const client_io,
OpsLogSocket* const olog)
OpsLogSocket* const olog,
int* http_ret)
{
int ret = 0;
@ -216,14 +217,16 @@ done:
rgw_log_op(store, rest, s, (op ? op->name() : "unknown"), olog);
}
int http_ret = s->err.http_ret;
if (http_ret != nullptr) {
*http_ret = s->err.http_ret;
}
int op_ret = 0;
if (op) {
op_ret = op->get_ret();
}
req->log_format(s, "op status=%d", op_ret);
req->log_format(s, "http status=%d", http_ret);
req->log_format(s, "http status=%d", s->err.http_ret);
if (handler)
handler->put_op(op);
@ -231,7 +234,7 @@ done:
dout(1) << "====== req done req=" << hex << req << dec
<< " op status=" << op_ret
<< " http_status=" << http_ret
<< " http_status=" << s->err.http_ret
<< " ======"
<< dendl;

3
src/rgw/rgw_process.h
View File

@ -196,7 +196,8 @@ extern int process_request(RGWRados* store,
const std::string& frontend_prefix,
const rgw_auth_registry_t& auth_registry,
RGWRestfulIO* client_io,
OpsLogSocket* olog);
OpsLogSocket* olog,
int* http_ret = nullptr);
extern int rgw_process_authenticated(RGWHandler_REST* handler,
RGWOp*& op,