better __repr__s for ConfigurationSources

satella/configuration/sources/base.py

@@ -15,6 +15,9 @@ class BaseSource(object):
         """
         return {}
 
+    def __repr__(self):
+        return '<%s>' % (self.__class__.__qualname__, )
+
 
 class StaticSource(BaseSource):
     """

satella/configuration/sources/derivative.py

@@ -22,6 +22,9 @@ class AlternativeSource(BaseSource):
         super().__init__()
         self.sources = sources
 
+    def __repr__(self):
+        return 'AlternativeSource(%s)' % (repr(self.sources), )
+
     def provide(self) -> dict:
         """
         :raises ConfigurationError: when backup fails too
@@ -51,6 +54,9 @@ class OptionalSource(AlternativeSource):
     def __init__(self, source: BaseSource):
         super().__init__(source, BaseSource())
 
+    def __repr__(self):
+        return 'OptionalSource(%s)' % (repr(self.sources[0], ))
+
 
 class MergingSource(BaseSource):
     """
@@ -72,7 +78,7 @@ class MergingSource(BaseSource):
             try:
                 p = source.provide()
             except ConfigurationError as e:
-                logger.warning('Raised %s while processing %s', e, p)
+                logger.warning('Raised %s while processing %s', e, source)
                 if self.on_fail == MergingSource.RAISE:
                     raise e
                 elif self.on_fail == MergingSource.SILENT:
@@ -86,3 +92,6 @@ class MergingSource(BaseSource):
             assert isinstance(cfg, dict), 'what merge_dicts returned wasn''t a dict'
 
         return cfg
+
+    def __repr__(self):
+        return '<MergingSource %s>' % (repr(self.sources), )

satella/configuration/sources/file.py

@@ -50,7 +50,8 @@ class FileSource(BaseSource):
                     raise ConfigurationError('%s is not a dict instance' % (s,))
                 logger.warning('Processed %s, returned %s', self.path, s)
                 return s
-            except ConfigurationError:
+            except ConfigurationError as e:
+                logger.warning('Got %s while processing %s', e, repr(data))
                 pass
         else:
             raise ConfigurationError('no reader could parse the file')

satella/exceptions.py

@@ -4,7 +4,7 @@ class BaseSatellaException(Exception):
         self.msg = msg
 
     def __str__(self):
-        return 'BaseSatellaException(%s)' % (repr(self.msg),)
+        return '%s(%s)' % (self._class__.__qualname__, repr(self.msg),)
 
 
 class ResourceLocked(BaseSatellaException):