From: Sage Weil <sage@redhat.com>
Date: Wed, 4 Mar 2020 20:20:28 +0000 (-0600)
Subject: mgr/cephadm: clean up log messages a bit
X-Git-Tag: v15.1.1~115^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e28148c43eafc32274d994c2bcf1c1614670d70a;p=ceph.git

mgr/cephadm: clean up log messages a bit

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index deb735b2d3031..cf80d521ee34d 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1732,7 +1732,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                 if d.matches_service(service_name):
                     args.append((d.daemon_type, d.daemon_id,
                                  d.hostname, action))
-        self.log.info('%s service %s' % (action, service_name))
+        self.log.info('%s service %s' % (action.capitalize(), service_name))
         return self._daemon_actions(args)
 
     @async_map_completion
@@ -1772,8 +1772,9 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             raise orchestrator.OrchestratorError(
                 'Unable to find %s.%s daemon(s)' % (
                     daemon_type, daemon_id))
-        self.log.info('%s daemons %s' % (action,
-                                         ['%s.%s' % (a[0], a[1]) for a in args]))
+        self.log.info('%s daemons %s' % (
+            action.capitalize(),
+            ','.join(['%s.%s' % (a[0], a[1]) for a in args])))
         return self._daemon_actions(args)
 
     def remove_daemons(self, names, force):