Merge "Adding common.utils.exception_to_str() to avoid encoding issue"

2 files changed, 17 insertions, 1 deletions

diff --git a/glance_store/common/config.py b/glance_store/common/config.py
index 17e5b42..7ec3824 100644
--- a/glance_store/common/config.py
+++ b/glance_store/common/config.py
@@ -26,6 +26,7 @@ from oslo.config import cfg
 from paste import deploy
 
 from glance.version import version_info as version
+from glance_store.common import utils
 
 paste_deploy_opts = [
     cfg.StrOpt('flavor',
@@ -213,6 +214,6 @@ def load_paste_app(app_name, flavor=None, conf_file=None):
                  "configuration file %(conf_file)s."
                  "\nGot: %(e)r") % {'app_name': app_name,
                                     'conf_file': conf_file,
-                                    'e': e})
+                                    'e': utils.exception_to_str(e)})
         logger.error(msg)
         raise RuntimeError(msg)
diff --git a/glance_store/common/utils.py b/glance_store/common/utils.py
index fb77519..d240b86 100644
--- a/glance_store/common/utils.py
+++ b/glance_store/common/utils.py
@@ -25,6 +25,9 @@ try:
     from eventlet import sleep
 except ImportError:
     from time import sleep
+import six
+
+from glance_store.openstack.common import strutils
 
 
 LOG = logging.getLogger(__name__)
@@ -137,3 +140,15 @@ class CooperativeReader(object):
 
     def __iter__(self):
         return cooperative_iter(self.fd.__iter__())
+
+
+def exception_to_str(exc):
+    try:
+        error = six.text_type(exc)
+    except UnicodeError:
+        try:
+            error = str(exc)
+        except UnicodeError:
+            error = ("Caught '%(exception)s' exception." %
+                     {"exception": exc.__class__.__name__})
+    return strutils.safe_encode(error, errors='ignore')