Backport log fix

Backport https://review.openstack.org/326916

Change-Id: I451d8242508eecdbe2e09d0bfe271ab69f339d29

osc_lib/logs.py

@@ -173,8 +173,6 @@ class LogConfigurator(object):
         if log_file:
             if not self.file_logger:
                 self.file_logger = logging.FileHandler(filename=log_file)
-            formatter = _FileFormatter(cloud_config=cloud_config)
-            self.file_logger.setFormatter(formatter)
             self.file_logger.setFormatter(_FileFormatter(config=cloud_config))
             self.file_logger.setLevel(log_level)
             self.root_logger.addHandler(self.file_logger)

osc_lib/utils.py

@@ -24,6 +24,7 @@ import time
 from oslo_utils import importutils
 
 from osc_lib import exceptions
+from osc_lib.i18n import _
 
 
 def find_resource(manager, name_or_id, **kwargs):
@@ -90,13 +91,21 @@ def find_resource(manager, name_or_id, **kwargs):
     #                 of client exceptions.
     except Exception as ex:
         if type(ex).__name__ == 'NotFound':
-            msg = "No %s with a name or ID of '%s' exists." % \
-                (manager.resource_class.__name__.lower(), name_or_id)
-            raise exceptions.CommandError(msg)
+            msg = _(
+                "No %(resource)s with a name or ID of '%(id)s' exists."
+            )
+            raise exceptions.CommandError(msg % {
+                'resource': manager.resource_class.__name__.lower(),
+                'id': name_or_id,
+            })
         if type(ex).__name__ == 'NoUniqueMatch':
-            msg = "More than one %s exists with the name '%s'." % \
-                (manager.resource_class.__name__.lower(), name_or_id)
-            raise exceptions.CommandError(msg)
+            msg = _(
+                "More than one %(resource)s exists with the name '%(id)s'."
+            )
+            raise exceptions.CommandError(msg % {
+                'resource': manager.resource_class.__name__.lower(),
+                'id': name_or_id,
+            })
         else:
             pass
 
@@ -107,8 +116,8 @@ def find_resource(manager, name_or_id, **kwargs):
             return resource
     else:
         # we found no match, report back this error:
-        msg = "Could not find resource %s" % name_or_id
-        raise exceptions.CommandError(msg)
+        msg = _("Could not find resource %s")
+        raise exceptions.CommandError(msg % name_or_id)
 
 
 def format_dict(data):
@@ -152,8 +161,8 @@ def get_field(item, field):
         else:
             return getattr(item, field)
     except Exception:
-        msg = "Resource doesn't have field %s" % field
-        raise exceptions.CommandError(msg)
+        msg = _("Resource doesn't have field %s")
+        raise exceptions.CommandError(msg % field)
 
 
 def get_item_properties(item, fields, mixed_case_fields=None, formatters=None):
@@ -234,14 +243,19 @@ def sort_items(items, sort_str):
         if ':' in sort_key:
             sort_key, direction = sort_key.split(':', 1)
             if not sort_key:
-                msg = "empty string is not a valid sort key"
+                msg = _("'<empty string>'' is not a valid sort key")
                 raise exceptions.CommandError(msg)
             if direction not in ['asc', 'desc']:
                 if not direction:
-                    direction = "empty string"
-                msg = ("%s is not a valid sort direction for sort key %s, "
-                       "use asc or desc instead" % (direction, sort_key))
-                raise exceptions.CommandError(msg)
+                    direction = "<empty string>"
+                msg = _(
+                    "'%(direction)s' is not a valid sort direction for "
+                    "sort key %(sort_key)s, use 'asc' or 'desc' instead"
+                )
+                raise exceptions.CommandError(msg % {
+                    'direction': direction,
+                    'sort_key': sort_key,
+                })
             if direction == 'desc':
                 reverse = True
         items.sort(key=lambda item: get_field(item, sort_key),
@@ -273,9 +287,15 @@ def get_client_class(api_name, version, version_map):
     try:
         client_path = version_map[str(version)]
     except (KeyError, ValueError):
-        msg = "Invalid %s client version '%s'. must be one of: %s" % (
-              (api_name, version, ', '.join(list(version_map.keys()))))
-        raise exceptions.UnsupportedVersion(msg)
+        msg = _(
+            "Invalid %(api_name)s client version '%(version)s'. "
+            "must be one of: %(version_map)s"
+        )
+        raise exceptions.UnsupportedVersion(msg % {
+            'api_name': api_name,
+            'version': version,
+            'version_map': ', '.join(list(version_map.keys())),
+        })
 
     return importutils.import_class(client_path)
 
@@ -389,11 +409,13 @@ def get_password(stdin, prompt=None, confirm=True):
                 second_pass = getpass.getpass("Repeat " + message)
                 if first_pass == second_pass:
                     return first_pass
-                print("The passwords entered were not the same")
+                msg = _("The passwords entered were not the same")
+                print(msg)
         except EOFError:  # Ctl-D
-            raise exceptions.CommandError("Error reading password.")
-    raise exceptions.CommandError("There was a request to be prompted for a"
-                                  " password and a terminal was not detected.")
+            msg = _("Error reading password")
+            raise exceptions.CommandError(msg)
+    msg = _("No terminal detected attempting to read password")
+    raise exceptions.CommandError(msg)
 
 
 def read_blob_file_contents(blob_file):
@@ -402,7 +424,7 @@ def read_blob_file_contents(blob_file):
             blob = file.read().strip()
         return blob
     except IOError:
-        msg = "Error occurred trying to read from file %s"
+        msg = _("Error occurred trying to read from file %s")
         raise exceptions.CommandError(msg % blob_file)