auth: bit less noise

diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc
index 6b2615bf372352b512cb201726dee851d20d0b21..5d0061aa7e982cafe7ecddffd179c602a9270140 100644 (file)
--- a/src/auth/KeyRing.cc
+++ b/src/auth/KeyRing.cc
@@ -20,6 +20,11 @@
 #include "Crypto.h"
 #include "auth/KeyRing.h"
 
+#define DOUT_SUBSYS auth
+#undef dout_prefix
+#define dout_prefix *_dout << dbeginl << "auth: "
+
+
 using namespace std;
 
 KeyRing g_keyring;
@@ -65,7 +70,7 @@ bool KeyRing::load_master(const char *filename)
 
   string name = g_conf.entity_name->to_str();
 
-  dout(0) << "looking for key entry name=" << name << dendl;
+  dout(10) << "looking for key entry name=" << name << dendl;
 
   miter = m.find(name);
   if (miter == m.end()) {
@@ -74,7 +79,7 @@ bool KeyRing::load_master(const char *filename)
       return false; 
   }
   master = miter->second.key;
-
+  dout(1) << "loaded key file " << filename << dendl;
   return true;
 }
 

diff --git a/src/auth/cephx/CephxProtocol.cc b/src/auth/cephx/CephxProtocol.cc
index dcdcb13226ce27c2ba91e4dd070ad60258415c77..d31ecfdf3a3d3a347b5bf79a454a8c8fa4487f65 100644 (file)
--- a/src/auth/cephx/CephxProtocol.cc
+++ b/src/auth/cephx/CephxProtocol.cc
@@ -135,7 +135,7 @@ bool CephXTicketManager::verify_service_ticket_reply(CryptoKey& secret,
   for (int i=0; i<(int)num; i++) {
     uint32_t type;
     ::decode(type, indata);
-    dout(0) << "got key for service_id=" << type << dendl;
+    dout(10) << "got key for service_id=" << type << dendl;
     CephXTicketHandler& handler = tickets_map[type];
     handler.service_id = type;
     if (!handler.verify_service_ticket_reply(secret, indata)) {

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index cadffad1ed5d7532cdf04e17ffc95d4bc086ac77..8239bce53db02b721c7437c619e7514c54095c38 100644 (file)
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -32,11 +32,7 @@ void common_init(std::vector<const char*>& args, const char *module_type, bool d
     _dout_open_log();
 
   if (init_keys) {
-    if (g_keyring.load_master(g_conf.keys_file)) {
-      dout(0) << "successfuly loaded secret key from " << g_conf.keys_file << dendl;
-    } else {
-      dout(0) << "failed to load secret key from " << g_conf.keys_file << dendl;
-    }
+    g_keyring.load_master(g_conf.keys_file);
   }
 }