From b0f4eae9b36d818fcc3c35efb8ceea8785410d79 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Wed, 19 Nov 2014 15:33:12 -0600
Subject: [PATCH] fixed up log levels

---
 hooks/ceph_broker.py | 15 +++++++++------
 hooks/hooks.py       | 10 ++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/hooks/ceph_broker.py b/hooks/ceph_broker.py
index 616c0f9..9fced94 100644
--- a/hooks/ceph_broker.py
+++ b/hooks/ceph_broker.py
@@ -6,23 +6,25 @@ import json
 
 from charmhelpers.core.hookenv import (
     log,
+    DEBUG,
     INFO,
-    ERROR
+    ERROR,
 )
 from charmhelpers.contrib.storage.linux.ceph import (
     create_pool,
-    pool_exists
+    pool_exists,
 )
 
 
-def decode(f):
+def decode_req_encode_rsp(f):
+    """Decorator to decode incoming requests and encode responses."""
     def decode_inner(req):
         return json.dumps(f(json.loads(req)))
 
     return decode_inner
 
 
-@decode
+@decode_req_encode_rsp
 def process_requests(reqs):
     """Process Ceph broker request(s).
 
@@ -33,6 +35,7 @@ def process_requests(reqs):
         version = reqs.get('api-version')
         if version == 1:
             return process_requests_v1(reqs['ops'])
+
     except Exception as exc:
         log(str(exc), level=ERROR)
         msg = ("Unexpected error occurred while processing requests: %s" %
@@ -56,7 +59,7 @@ def process_requests_v1(reqs):
     log("Processing %s ceph broker requests" % (len(reqs)), level=INFO)
     for req in reqs:
         op = req.get('op')
-        log("Processing op='%s'" % (op), level=INFO)
+        log("Processing op='%s'" % (op), level=DEBUG)
         # Use admin client since we do not have other client key locations
         # setup to use them for these operations.
         svc = 'admin'
@@ -78,7 +81,7 @@ def process_requests_v1(reqs):
                 create_pool(service=svc, name=pool, replicas=replicas)
             else:
                 log("Pool '%s' already exists - skipping create" % (pool),
-                    level=INFO)
+                    level=DEBUG)
         else:
             msg = "Unknown operation '%s'" % (op)
             log(msg, level=ERROR)
diff --git a/hooks/hooks.py b/hooks/hooks.py
index ed3da21..9014401 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -16,7 +16,7 @@ import sys
 import ceph
 from charmhelpers.core.hookenv import (
     log,
-    INFO,
+    DEBUG,
     ERROR,
     config,
     relation_ids,
@@ -300,15 +300,13 @@ def client_relation_changed(relid=None):
         settings = relation_get(rid=relid)
         if 'broker_req' in settings:
             if not ceph.is_leader():
-                log("Not leader - ignoring broker request", level=INFO)
+                log("Not leader - ignoring broker request", level=DEBUG)
             else:
-                req = settings['broker_req']
-                log("Broker request received from ceph client")
-                rsp = process_requests(req)
+                rsp = process_requests(settings['broker_req'])
                 relation_set(relation_id=relid,
                              relation_settings={'broker_rsp': rsp})
     else:
-        log('mon cluster not in quorum')
+        log('mon cluster not in quorum', level=DEBUG)
 
 
 @hooks.hook('upgrade-charm')