the default message is much more useful with the data dictionary back…

… in there
mahmoud · Jun 14, 2016 · 2103854 · 2103854
1 parent 5f28471
commit 2103854
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lithoxyl/logger.py b/lithoxyl/logger.py
@@ -275,17 +275,21 @@ def record(self, level, record_name, **kw):
 
     def wrap(self, level, record_name=None,
              inject_as=None, enable_wrap=True, **kw):
+
+        record_kwargs = kw
+
         def record_wrapper(func_to_log,
                            _enable=enable_wrap,
-                           _name=record_name):
+                           _name=record_name,
+                           _record_kwargs=record_kwargs):
             if not _enable:
                 return func_to_log
             if _name is None:  # wooo nonlocal
                 _name = func_to_log.__name__
 
             @wraps(func_to_log, injected=inject_as)
             def logged_func(*a, **kw):
-                rec = self.record(level, _name, **kw)
+                rec = self.record(level, _name, **record_kwargs)
                 if inject_as:
                     kw[inject_as] = rec
                 with rec:

diff --git a/lithoxyl/record.py b/lithoxyl/record.py
@@ -146,7 +146,7 @@ def success(self, message=None, *a, **kw):
         """
         if not message:
             if self.data_map:
-                message = self.name + ' succeeded ({data_map_repr})'
+                message = self.name + ' succeeded - ({data_map_repr})'
             else:
                 message = self.name + ' succeeded'
         return self._end('success', message, a, kw)
@@ -159,7 +159,7 @@ def failure(self, message=None, *a, **kw):
         """
         if not message:
             if self.data_map:
-                message = self.name + ' failed ({data_map_repr})'
+                message = self.name + ' failed - ({data_map_repr})'
             else:
                 message = self.name + ' failed'
 
@@ -190,7 +190,7 @@ def _exception(self, exc_type, exc_val, exc_tb, message, fargs, data):
             cp = exc_info.tb_info.frames[-1]
             t = "%s raised exception: %s(%r) from %s on line %s of file '%s'"
             if self.data_map:
-                t += ' ({data_map_repr})'
+                t += ' - ({data_map_repr})'
             message = t % (self.name, exc_info.exc_type, exc_info.exc_msg,
                            cp.func_name, cp.lineno, cp.module_path)