From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 20 Mar 2018 14:13:31 +0000 (-0700)
Subject: Merge pull request #20157 from pdvian/wip-22812-luminous
X-Git-Tag: v12.2.5~137
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3ff3431400927419f977373d27edfd0b3936c2fb;p=ceph.git

Merge pull request #20157 from pdvian/wip-22812-luminous

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

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

3ff3431400927419f977373d27edfd0b3936c2fb
diff --cc src/rgw/rgw_process.cc
index e614cf0d2b2,ecea70c055c..dd4ca9b6922
--- a/src/rgw/rgw_process.cc
+++ b/src/rgw/rgw_process.cc
@@@ -115,9 -115,12 +115,10 @@@ int process_request(RGWRados* const sto
                      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;
 -
 -  client_io->init(g_ceph_context);
 +  int ret = client_io->init(g_ceph_context);
  
    req->log_init();