From 52e6e852034118d8197304229ec29c10737e2c40 Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Tue, 21 Jun 2011 11:37:43 -0700
Subject: [PATCH] rgw: some cleanups

---
 src/rgw/rgw_common.cc  | 6 +++---
 src/rgw/rgw_op.cc      | 1 -
 src/rgw/rgw_os_auth.cc | 2 +-
 src/rgw/rgw_rest.cc    | 2 --
 src/rgw/rgw_rest_s3.cc | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 94cc8a2cd27cf..de0073d27fd9c 100644
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -336,7 +336,7 @@ done:
     pos--; // squash null termination
   strcpy(buf + pos, p);
   len = pos + strlen(p) + 1;
-  RGW_LOG(0) << "RGWFormatter::write_data: len= " << len << " bytes" << dendl;
+  RGW_LOG(20) << "RGWFormatter::write_data: len= " << len << " bytes" << dendl;
 done_free:
   if (!p_on_stack)
     free(p);
@@ -355,7 +355,7 @@ void RGWFormatter::flush(struct req_state *s)
   if (!buf)
     return;
 
-  RGW_LOG(0) << "flush(): buf='" << buf << "'  strlen(buf)=" << strlen(buf) << dendl;
+  RGW_LOG(10) << "flush(): buf='" << buf << "'  strlen(buf)=" << strlen(buf) << dendl;
   CGI_PutStr(s, buf, len - 1);
   reset();
 }
@@ -365,7 +365,7 @@ void RGWFormatter::flush(ostream& os)
   if (!buf)
     return;
 
-  RGW_LOG(0) << "flush(): buf='" << buf << "'  strlen(buf)=" << strlen(buf) << dendl;
+  RGW_LOG(10) << "flush(): buf='" << buf << "'  strlen(buf)=" << strlen(buf) << dendl;
   os << buf << std::endl;
   reset();
 }
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 5abaf979903ae..f79099a13e065 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -627,7 +627,6 @@ void RGWPutObj::execute()
       info.size = s->obj_size;
       info.modified = ceph_clock_now(g_ceph_context);
       ::encode(info, bl);
-      RGW_LOG(0) << "JJJ name=" << p << "bl.length()=" << bl.length() << dendl;
       meta_attrs[p] = bl;
 
       rgw_obj meta_obj(s->bucket_str, multipart_meta_obj, s->object_str, mp_ns);
diff --git a/src/rgw/rgw_os_auth.cc b/src/rgw/rgw_os_auth.cc
index 302f05327a7ed..ab0044215eed1 100644
--- a/src/rgw/rgw_os_auth.cc
+++ b/src/rgw/rgw_os_auth.cc
@@ -20,7 +20,7 @@ static int build_token(string& os_user, string& key, uint64_t nonce, utime_t& ex
 
   char buf[bl.length() * 2 + 1];
   buf_to_hex((const unsigned char *)bl.c_str(), bl.length(), buf);
-  RGW_LOG(0) << "bl=" << buf << dendl;
+  RGW_LOG(20) << "build_token token=" << buf << dendl;
 
   char k[CEPH_CRYPTO_HMACSHA1_DIGESTSIZE];
   memset(k, 0, sizeof(k));
diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index 0288dac001a69..d99e8df01be24 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -466,8 +466,6 @@ void init_entities_from_header(struct req_state *s)
     }
   }
 
-  RGW_LOG(0) << "s->formatter=" << (void *)s->formatter << dendl;
-
   if (s->prot_flags & RGW_REST_OPENSTACK) {
     string ver;
     string auth_key;
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index be277fed51bb4..83183fd12bb7e 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -517,7 +517,7 @@ static void get_canon_resource(struct req_state *s, string& dest)
       dest.append(iter->second);
     }
   }
-  RGW_LOG(0) << "dest=" << dest << dendl;
+  RGW_LOG(10) << "get_canon_resource(): dest=" << dest << dendl;
 }
 
 /*
-- 
2.39.5