]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #20157 from pdvian/wip-22812-luminous
authorYuri Weinstein <yweinste@redhat.com>
Tue, 20 Mar 2018 14:13:31 +0000 (07:13 -0700)
committerGitHub <noreply@github.com>
Tue, 20 Mar 2018 14:13:31 +0000 (07:13 -0700)
luminous: rgw: log the right http status code in civetweb frontend's access log

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/rgw/rgw_process.cc

index e614cf0d2b28e2b1f7d02e23bc36487f8dc091ea,ecea70c055cb8b6bfd621f941474bdf648159e74..dd4ca9b6922bd5a6a057f77dd46874869aa5648a
@@@ -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();