rgw: rename s3_code to err_code for swift

Signed-off-by: Guo Zhandong <guozhandong@cmss.chinamobile.com>

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 8f8791528f3a02cd98e4108a5ce46ab8267f6c9e..b2cfcc422af33fd1b210d9347dceab06d3a2526e 100644 (file)
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -160,7 +160,7 @@ clear()
 {
   http_ret = 200;
   ret = 0;
-  s3_code.clear();
+  err_code.clear();
 }
 
 bool rgw_err::
@@ -312,20 +312,20 @@ void set_req_state_err(struct rgw_err& err,       /* out */
   bool is_website_redirect = false;
 
   if (prot_flags & RGW_REST_SWIFT) {
-    if (search_err(rgw_http_swift_errors, err_no, is_website_redirect, err.http_ret, err.s3_code))
+    if (search_err(rgw_http_swift_errors, err_no, is_website_redirect, err.http_ret, err.err_code))
       return;
   }
 
   //Default to searching in s3 errors
   is_website_redirect |= (prot_flags & RGW_REST_WEBSITE)
                && err_no == ERR_WEBSITE_REDIRECT && err.is_clear();
-  if (search_err(rgw_http_s3_errors, err_no, is_website_redirect, err.http_ret, err.s3_code))
+  if (search_err(rgw_http_s3_errors, err_no, is_website_redirect, err.http_ret, err.err_code))
       return;
   dout(0) << "WARNING: set_req_state_err err_no=" << err_no
        << " resorting to 500" << dendl;
 
   err.http_ret = 500;
-  err.s3_code = "UnknownError";
+  err.err_code = "UnknownError";
 }
 
 void set_req_state_err(struct req_state* s, int err_no, const string& err_msg)
@@ -347,8 +347,8 @@ void dump(struct req_state* s)
 {
   if (s->format != RGW_FORMAT_HTML)
     s->formatter->open_object_section("Error");
-  if (!s->err.s3_code.empty())
-    s->formatter->dump_string("Code", s->err.s3_code);
+  if (!s->err.err_code.empty())
+    s->formatter->dump_string("Code", s->err.err_code);
   if (!s->err.message.empty())
     s->formatter->dump_string("Message", s->err.message);
   if (!s->bucket_name.empty()) // TODO: connect to expose_bucket
@@ -431,7 +431,7 @@ void req_info::init_meta_info(bool *found_bad_meta)
 
 std::ostream& operator<<(std::ostream& oss, const rgw_err &err)
 {
-  oss << "rgw_err(http_ret=" << err.http_ret << ", s3='" << err.s3_code << "') ";
+  oss << "rgw_err(http_ret=" << err.http_ret << ", err_code='" << err.err_code << "') ";
   return oss;
 }
 

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 63854015c8728b168fb5530727716c559dda85f4..6337e725641db0ee88b34fb056e76f5ccb7a9409 100644 (file)
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -272,7 +272,7 @@ struct rgw_err {
 
   int http_ret;
   int ret;
-  std::string s3_code;
+  std::string err_code;
   std::string message;
 };
 

diff --git a/src/rgw/rgw_log.cc b/src/rgw/rgw_log.cc
index 51dbd1bbe93ba672f19027c4ee57ab4b0eae697d..5f7b14d4bec3d9a113894b3dd127c006a50dccb4 100644 (file)
--- a/src/rgw/rgw_log.cc
+++ b/src/rgw/rgw_log.cc
@@ -381,7 +381,7 @@ int rgw_log_op(RGWRados *store, RGWREST* const rest, struct req_state *s,
   } else
     entry.http_status = "200"; // default
 
-  entry.error_code = s->err.s3_code;
+  entry.error_code = s->err.err_code;
   entry.bucket_id = bucket_id;
 
   bufferlist bl;

diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 6cca4f2efc2979055b8cba1a128d6e9e16c814b1..456939f0c2ea94f4e956624eb71866474a1901e7 100644 (file)
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -1976,7 +1976,7 @@ void RGWFormPost::send_response()
   }
 
   set_req_state_err(s, op_ret);
-  s->err.s3_code = err_msg;
+  s->err.err_code = err_msg;
   dump_errno(s);
   if (! redirect.empty()) {
     dump_redirect(s, redirect);