]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume process decode to utf-8 when logging descriptors
authorAlfredo Deza <adeza@redhat.com>
Wed, 25 Jul 2018 12:39:16 +0000 (08:39 -0400)
committerAlfredo Deza <adeza@redhat.com>
Wed, 25 Jul 2018 16:37:44 +0000 (12:37 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
src/ceph-volume/ceph_volume/process.py

index 2c8467fc4c084e77b0e3f83eee7dbe2a25e481dc..1972883fa53f791a7f84dc9bf47bdf3441099bc9 100644 (file)
@@ -52,7 +52,10 @@ def log_descriptors(reads, process, terminal_logging):
     for descriptor in reads:
         descriptor_name = descriptor_names[descriptor]
         try:
-            log_output(descriptor_name, read(descriptor, 1024), terminal_logging, True)
+            message = read(descriptor, 1024)
+            if not isinstance(message, str):
+                message = message.decode('utf-8')
+            log_output(descriptor_name, message, terminal_logging, True)
         except (IOError, OSError):
             # nothing else to log
             pass