reduce amount of noise in log

2 files changed, 19 insertions, 11 deletions

diff --git a/src/carquinyol/__init__.py b/src/carquinyol/__init__.py
index d53da54..68d961b 100644
--- a/src/carquinyol/__init__.py
+++ b/src/carquinyol/__init__.py
@@ -1,8 +1,15 @@
 import logging
 import decorator
 
-@decorator.decorator
-def trace(f, *args, **kwargs) :
-    logging.debug("%s(%s)" % (f.__name__, ", ".join([repr(a) for a in args]+['%s=%r' % (k,v) for (k,v) in kwargs.items()]))),
+# TODO: skip positional arguments by name as well
+def trace(skip_args=[], skip_kwargs=[]) :
+  def _trace(f, *args, **kwargs) :
+    logging.debug("%s(%s)" % (f.__name__,
+      ", ".join(
+        [repr(a) for (idx, a) in enumerate(args) if idx not in skip_args]+\
+        ['%s=%r' % (k,v) for (k,v) in kwargs.items() if k not in skip_kwargs])))
+
     return f(*args, **kwargs)
 
+  return decorator.decorator(_trace)
+
diff --git a/src/carquinyol/datastore.py b/src/carquinyol/datastore.py
index 8a04ca9..418e2a3 100644
--- a/src/carquinyol/datastore.py
+++ b/src/carquinyol/datastore.py
@@ -113,7 +113,7 @@ class DataStore(dbus.service.Object):
         else:
             return True
 
-    @trace
+    @trace()
     def _create_completion_cb(self, async_cb, async_err_cb, uid, vid, exc=None):
         if exc is not None:
             async_err_cb(exc)
@@ -152,7 +152,7 @@ class DataStore(dbus.service.Object):
     def Created(self, uid, vid):
         pass
 
-    @trace
+    @trace()
     def _update_completion_cb(self, async_cb, async_err_cb, uid, vid, exc=None):
         if exc is not None:
             async_err_cb(exc)
@@ -168,7 +168,7 @@ class DataStore(dbus.service.Object):
              out_signature='ss',
              async_callbacks=('async_cb', 'async_err_cb'),
              byte_arrays=True)
-    @trace
+    @trace(skip_args=[3], skip_kwargs=["props"]) # "preview" metadata will clutter logfile otherwise
     def update(self, uid, vid, props, file_path, transfer_ownership,
                async_cb, async_err_cb):
 
@@ -201,7 +201,7 @@ class DataStore(dbus.service.Object):
     @dbus.service.method(DS_DBUS_INTERFACE,
              in_signature='a{sv}as',
              out_signature='aa{sv}u')
-    @trace
+    @trace()
     def find(self, query, properties):
         t = time.time()
 
@@ -237,20 +237,21 @@ class DataStore(dbus.service.Object):
             limit = query.get('limit', MAX_QUERY_LIMIT)
             uvids = uvids[offset:offset + limit]
 
-        logger.debug('uvids=%r' % (uvids,))
+#        logger.debug('uvids=%r' % (uvids,))
         entries = []
         for (uid,vid) in uvids:
             metadata = self._metadata_store.retrieve(uid, vid, properties)
             entries.append(metadata)
         logger.debug('find(): %r' % (time.time() - t))
-        logger.debug('count=%r, entries=%r' % (count, entries))
+#        logger.debug('count=%r, entries=%r' % (count, entries))
+        logger.debug('count=%r' % (count,))
         return entries, count
 
     @dbus.service.method(DS_DBUS_INTERFACE,
              in_signature='ss',
              out_signature='s',
              sender_keyword='sender')
-    @trace
+    @trace()
     def get_filename(self, uid, vid, sender=None):
         user_id = dbus.Bus().get_unix_user(sender)
         extension = self._get_extension(uid,vid)
@@ -265,7 +266,7 @@ class DataStore(dbus.service.Object):
     @dbus.service.method(DS_DBUS_INTERFACE,
                          in_signature='ss',
                          out_signature='a{sv}')
-    @trace
+    @trace()
     def get_properties(self, uid, vid):
         metadata = self._metadata_store.retrieve(uid,vid)
         return metadata