Debug: Add or adjust some traces and dumps

29 files changed, 158 insertions, 42 deletions

diff --git a/plugins/cover-thumbnailer/cover-thumbnailer-provider.c b/plugins/cover-thumbnailer/cover-thumbnailer-provider.c
index c3015aa..880f772 100644
--- a/plugins/cover-thumbnailer/cover-thumbnailer-provider.c
+++ b/plugins/cover-thumbnailer/cover-thumbnailer-provider.c
@@ -152,6 +152,10 @@ cover_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provide
   /* add the thumbnailer to the list */
   thumbnailers = g_list_append (thumbnailers, thumbnailer);
 
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes",
+                          (const gchar *const *) uri_schemes);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types", mime_types);
+
   /* free URI schemes */
   g_strfreev (uri_schemes);
 
diff --git a/plugins/cover-thumbnailer/cover-thumbnailer.c b/plugins/cover-thumbnailer/cover-thumbnailer.c
index e36deff..4758dee 100644
--- a/plugins/cover-thumbnailer/cover-thumbnailer.c
+++ b/plugins/cover-thumbnailer/cover-thumbnailer.c
@@ -615,10 +615,16 @@ cover_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
   TumblerThumbnailFlavor *flavor;
   GFile                  *gfile;
 
+  /* do nothing if cancelled */
+  if (g_cancellable_is_cancelled (cancellable))
+    return;
+
   /* source file */
   uri = tumbler_file_info_get_uri (info);
   gfile = g_file_new_for_uri (uri);
 
+  g_debug ("Handling URI '%s'", uri);
+
   /* target data */
   thumbnail = tumbler_file_info_get_thumbnail (info);
   flavor = tumbler_thumbnail_get_flavor (thumbnail);
diff --git a/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c b/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c
index 7cb47bb..1b8ffe4 100644
--- a/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c
+++ b/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c
@@ -153,10 +153,13 @@ desktop_thumbnailer_get_from_desktop_file (GFile *file,
                               "mime-types", mime_types,
                               "exec", exec,
                               NULL);
+
+  g_debug ("Registered thumbnailer '%s'", filename);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types",
+                          (const gchar *const *) mime_types);
+
   g_key_file_free (key_file);
   g_strfreev(mime_types);
-
-  g_debug ("Registered thumbnailer %s", exec);
   g_free(exec);
 
   return thumbnailer;
@@ -262,6 +265,9 @@ desktop_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provi
    * priority come first */
   directories = g_list_reverse (directories);
 
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes",
+                          (const gchar *const *) uri_schemes);
+
   /* thumbnailers end up in reverse order here, since they are prepended, but the list must
    * not be reversed: this will happen during sorted insertion in tumbler_registry_add() */
   for (iter = directories; iter != NULL; iter = iter->next)
diff --git a/plugins/desktop-thumbnailer/desktop-thumbnailer.c b/plugins/desktop-thumbnailer/desktop-thumbnailer.c
index 5e79543..7304ea6 100644
--- a/plugins/desktop-thumbnailer/desktop-thumbnailer.c
+++ b/plugins/desktop-thumbnailer/desktop-thumbnailer.c
@@ -360,6 +360,8 @@ desktop_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
   uri = tumbler_file_info_get_uri (info);
   file = g_file_new_for_uri (uri);
 
+  g_debug ("Handling URI '%s'", uri);
+
   thumbnail = tumbler_file_info_get_thumbnail (info);
   g_assert (thumbnail != NULL);
 
diff --git a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-provider.c b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-provider.c
index a143546..685df6e 100644
--- a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-provider.c
+++ b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-provider.c
@@ -136,6 +136,10 @@ ffmpeg_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provid
   /* add the thumbnailer to the list */
   thumbnailers = g_list_append (thumbnailers, thumbnailer);
 
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes",
+                          (const gchar *const *) uri_schemes);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types", mime_types);
+
   /* free URI schemes */
   g_strfreev (uri_schemes);
 
diff --git a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer.c b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer.c
index 7dc1a67..f2edf1e 100644
--- a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer.c
+++ b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer.c
@@ -152,8 +152,10 @@ ffmpeg_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
   if (g_cancellable_is_cancelled (cancellable))
     return;
 
-  /* Check if is a sparse video file */
   uri = tumbler_file_info_get_uri (info);
+  g_debug ("Handling URI '%s'", uri);
+
+  /* Check if is a sparse video file */
   if (tumbler_util_guess_is_sparse (info))
   {
     g_debug ("Video file '%s' is probably sparse, skipping", uri);
diff --git a/plugins/font-thumbnailer/font-thumbnailer-provider.c b/plugins/font-thumbnailer/font-thumbnailer-provider.c
index e8f7571..0a9ac9e 100644
--- a/plugins/font-thumbnailer/font-thumbnailer-provider.c
+++ b/plugins/font-thumbnailer/font-thumbnailer-provider.c
@@ -123,6 +123,10 @@ font_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provider
   /* add the thumbnailer to the list */
   thumbnailers = g_list_append (thumbnailers, thumbnailer);
 
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes",
+                          (const gchar *const *) uri_schemes);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types", mime_types);
+
   /* free URI schemes */
   g_strfreev (uri_schemes);
 
diff --git a/plugins/font-thumbnailer/font-thumbnailer.c b/plugins/font-thumbnailer/font-thumbnailer.c
index 6ea370c..f9ed136 100644
--- a/plugins/font-thumbnailer/font-thumbnailer.c
+++ b/plugins/font-thumbnailer/font-thumbnailer.c
@@ -421,6 +421,7 @@ font_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
     return;
 
   uri = tumbler_file_info_get_uri (info);
+  g_debug ("Handling URI '%s'", uri);
 
   /* check if we have a valid freetype library object */
   if (font_thumbnailer->library_error != 0)
diff --git a/plugins/gepub-thumbnailer/gepub-thumbnailer-provider.c b/plugins/gepub-thumbnailer/gepub-thumbnailer-provider.c
index bba2323..775e953 100644
--- a/plugins/gepub-thumbnailer/gepub-thumbnailer-provider.c
+++ b/plugins/gepub-thumbnailer/gepub-thumbnailer-provider.c
@@ -121,6 +121,10 @@ gepub_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provide
   /* add the thumbnailer to the list */
   thumbnailers = g_list_append (thumbnailers, thumbnailer);
 
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes",
+                          (const gchar *const *) uri_schemes);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types", mime_types);
+
   /* free URI schemes and MIME types */
   g_strfreev (uri_schemes);
 
diff --git a/plugins/gepub-thumbnailer/gepub-thumbnailer.c b/plugins/gepub-thumbnailer/gepub-thumbnailer.c
index b019020..98062c7 100644
--- a/plugins/gepub-thumbnailer/gepub-thumbnailer.c
+++ b/plugins/gepub-thumbnailer/gepub-thumbnailer.c
@@ -161,6 +161,7 @@ gepub_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
 
   uri = tumbler_file_info_get_uri (info);
   file = g_file_new_for_uri (uri);
+  g_debug ("Handling URI '%s'", uri);
 
   if (g_file_is_native (file))
     {
diff --git a/plugins/gst-thumbnailer/gst-thumbnailer-provider.c b/plugins/gst-thumbnailer/gst-thumbnailer-provider.c
index dd3d66a..b76f419 100644
--- a/plugins/gst-thumbnailer/gst-thumbnailer-provider.c
+++ b/plugins/gst-thumbnailer/gst-thumbnailer-provider.c
@@ -243,6 +243,10 @@ gst_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provider)
                               "mime-types", mime_types,
                               NULL);
 
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes",
+                          (const gchar *const *) uri_schemes);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types", mime_types);
+
   g_strfreev (uri_schemes);
 
   return g_list_append (NULL, thumbnailer);
diff --git a/plugins/gst-thumbnailer/gst-thumbnailer.c b/plugins/gst-thumbnailer/gst-thumbnailer.c
index 402f6ac..d68a3cb 100644
--- a/plugins/gst-thumbnailer/gst-thumbnailer.c
+++ b/plugins/gst-thumbnailer/gst-thumbnailer.c
@@ -535,8 +535,10 @@ gst_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
   if (g_cancellable_is_cancelled (cancellable))
     return;
 
-  /* Check if is a sparse video file */
   uri = tumbler_file_info_get_uri (info);
+  g_debug ("Handling URI '%s'", uri);
+
+  /* Check if is a sparse video file */
   if (tumbler_util_guess_is_sparse (info))
   {
     g_debug ("Video file '%s' is probably sparse, skipping", uri);
diff --git a/plugins/jpeg-thumbnailer/jpeg-thumbnailer-provider.c b/plugins/jpeg-thumbnailer/jpeg-thumbnailer-provider.c
index e53c123..72dc8aa 100644
--- a/plugins/jpeg-thumbnailer/jpeg-thumbnailer-provider.c
+++ b/plugins/jpeg-thumbnailer/jpeg-thumbnailer-provider.c
@@ -113,6 +113,10 @@ jpeg_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provider
                               "uri-schemes", uri_schemes, "mime-types", mime_types, 
                               NULL);
 
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes",
+                          (const gchar *const *) uri_schemes);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types", mime_types);
+
   /* free URI schemes and MIME types */
   g_strfreev (uri_schemes);
 
diff --git a/plugins/jpeg-thumbnailer/jpeg-thumbnailer.c b/plugins/jpeg-thumbnailer/jpeg-thumbnailer.c
index f89128d..bf5c0d3 100644
--- a/plugins/jpeg-thumbnailer/jpeg-thumbnailer.c
+++ b/plugins/jpeg-thumbnailer/jpeg-thumbnailer.c
@@ -801,6 +801,7 @@ jpeg_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
     return;
 
   uri = tumbler_file_info_get_uri (info);
+  g_debug ("Handling URI '%s'", uri);
 
   /* try to open the source file for reading */
   file = g_file_new_for_uri (uri);
diff --git a/plugins/odf-thumbnailer/odf-thumbnailer-provider.c b/plugins/odf-thumbnailer/odf-thumbnailer-provider.c
index b76c93d..ff76fd8 100644
--- a/plugins/odf-thumbnailer/odf-thumbnailer-provider.c
+++ b/plugins/odf-thumbnailer/odf-thumbnailer-provider.c
@@ -151,6 +151,10 @@ odf_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provider)
   /* add the thumbnailer to the list */
   thumbnailers = g_list_append (thumbnailers, thumbnailer);
 
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes",
+                          (const gchar *const *) uri_schemes);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types", mime_types);
+
   /* free URI schemes */
   g_strfreev (uri_schemes);
 
diff --git a/plugins/odf-thumbnailer/odf-thumbnailer.c b/plugins/odf-thumbnailer/odf-thumbnailer.c
index 629d8ee..ff47bfc 100644
--- a/plugins/odf-thumbnailer/odf-thumbnailer.c
+++ b/plugins/odf-thumbnailer/odf-thumbnailer.c
@@ -286,6 +286,7 @@ odf_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
 
   uri = tumbler_file_info_get_uri (info);
   file = g_file_new_for_uri (uri);
+  g_debug ("Handling URI '%s'", uri);
 
   if (g_file_is_native (file))
     {
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
index 2e12a20..3b7c9f0 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
@@ -162,6 +162,11 @@ pixbuf_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provid
                               "uri-schemes", uri_schemes, "mime-types", mime_types, 
                               NULL);
 
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes",
+                          (const gchar *const *) uri_schemes);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types",
+                          (const gchar *const *) mime_types);
+
   /* free URI schemes and MIME types */
   g_strfreev (uri_schemes);
   g_strfreev (mime_types);
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
index 40dba65..6395d7f 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
@@ -209,6 +209,7 @@ pixbuf_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
     return;
 
   uri = tumbler_file_info_get_uri (info);
+  g_debug ("Handling URI '%s'", uri);
 
   /* try to open the source file for reading */
   file = g_file_new_for_uri (uri);
diff --git a/plugins/poppler-thumbnailer/poppler-thumbnailer-provider.c b/plugins/poppler-thumbnailer/poppler-thumbnailer-provider.c
index 6abd02e..6fd6b7d 100644
--- a/plugins/poppler-thumbnailer/poppler-thumbnailer-provider.c
+++ b/plugins/poppler-thumbnailer/poppler-thumbnailer-provider.c
@@ -121,6 +121,10 @@ poppler_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provi
   /* add the thumbnailer to the list */
   thumbnailers = g_list_append (thumbnailers, thumbnailer);
 
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes",
+                          (const gchar *const *) uri_schemes);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types", mime_types);
+
   /* free URI schemes and MIME types */
   g_strfreev (uri_schemes);
 
diff --git a/plugins/poppler-thumbnailer/poppler-thumbnailer.c b/plugins/poppler-thumbnailer/poppler-thumbnailer.c
index 86d02ef..8ee1083 100644
--- a/plugins/poppler-thumbnailer/poppler-thumbnailer.c
+++ b/plugins/poppler-thumbnailer/poppler-thumbnailer.c
@@ -244,11 +244,11 @@ poppler_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
   if (g_cancellable_is_cancelled (cancellable))
     return;
 
-  /* try to load the PDF/PS file based on the URI */
   uri = tumbler_file_info_get_uri (info);
-  document = poppler_document_new_from_file (uri, NULL, &error);
+  g_debug ("Handling URI '%s'", uri);
 
-  /* check if that failed */
+  /* try to load the PDF/PS file based on the URI */
+  document = poppler_document_new_from_file (uri, NULL, &error);
   if (document == NULL)
     {
       /* make sure to free error data */
diff --git a/plugins/raw-thumbnailer/raw-thumbnailer-provider.c b/plugins/raw-thumbnailer/raw-thumbnailer-provider.c
index 5677a66..0ceb3fe 100644
--- a/plugins/raw-thumbnailer/raw-thumbnailer-provider.c
+++ b/plugins/raw-thumbnailer/raw-thumbnailer-provider.c
@@ -130,5 +130,8 @@ raw_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provider)
   /* add the thumbnailer to the list */
   thumbnailers = g_list_append (thumbnailers, thumbnailer);
 
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes", uri_schemes);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types", mime_types);
+
   return thumbnailers;
 }
diff --git a/plugins/raw-thumbnailer/raw-thumbnailer.c b/plugins/raw-thumbnailer/raw-thumbnailer.c
index 16c75da..92ac01d 100644
--- a/plugins/raw-thumbnailer/raw-thumbnailer.c
+++ b/plugins/raw-thumbnailer/raw-thumbnailer.c
@@ -126,6 +126,7 @@ raw_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
 
   uri = tumbler_file_info_get_uri (info);
   file = g_file_new_for_uri (uri);
+  g_debug ("Handling URI '%s'", uri);
 
   thumbnail = tumbler_file_info_get_thumbnail (info);
   g_assert (thumbnail != NULL);
diff --git a/tumbler/tumbler-util.c b/tumbler/tumbler-util.c
index c7be630..04c434d 100644
--- a/tumbler/tumbler-util.c
+++ b/tumbler/tumbler-util.c
@@ -59,6 +59,32 @@ tumbler_util_is_debug_logging_enabled (const gchar *log_domain)
 
 
 
+void
+tumbler_util_dump_strv (const gchar *log_domain,
+                        const gchar *label,
+                        const gchar *const *strv)
+{
+  GString *string;
+  const gchar *const *p;
+
+  g_return_if_fail (label != NULL && strv != NULL);
+
+  if (! tumbler_util_is_debug_logging_enabled (log_domain))
+    return;
+
+  string = g_string_new (label);
+  g_string_append (string, ":\n");
+
+  for (p = strv; *p != NULL; p++)
+    g_string_append_printf (string, "  %s\n", *p);
+
+  g_string_truncate (string, string->len - 1);
+  g_log (log_domain, G_LOG_LEVEL_DEBUG, "%s", string->str);
+  g_string_free (string, TRUE);
+}
+
+
+
 gchar **
 tumbler_util_get_supported_uri_schemes (void)
 {
diff --git a/tumbler/tumbler-util.h b/tumbler/tumbler-util.h
index 037bcf3..20a0cc3 100644
--- a/tumbler/tumbler-util.h
+++ b/tumbler/tumbler-util.h
@@ -30,6 +30,10 @@ G_BEGIN_DECLS
 
 gboolean tumbler_util_is_debug_logging_enabled (const gchar *log_domain);
 
+void tumbler_util_dump_strv (const gchar *log_domain,
+                             const gchar *label,
+                             const gchar *const *strv);
+
 gchar **tumbler_util_get_supported_uri_schemes (void) G_GNUC_MALLOC;
 
 GKeyFile *tumbler_util_get_settings (void) G_GNUC_MALLOC;
diff --git a/tumblerd/main.c b/tumblerd/main.c
index eaf6658..58efe81 100644
--- a/tumblerd/main.c
+++ b/tumblerd/main.c
@@ -284,6 +284,8 @@ main (int    argc,
       /* start the lifecycle manager */
       tumbler_lifecycle_manager_start (lifecycle_manager);
 
+      g_debug ("Ready to handle requests\n");
+
       /* enter the main loop, thereby making the tumbler service available */
       g_main_loop_run (main_loop);
     }
diff --git a/tumblerd/tumbler-cache-service.c b/tumblerd/tumbler-cache-service.c
index 79ceff6..e2805ee 100644
--- a/tumblerd/tumbler-cache-service.c
+++ b/tumblerd/tumbler-cache-service.c
@@ -330,6 +330,12 @@ tumbler_cache_service_move_thread (gpointer data,
 
   if (service->cache != NULL)
     {
+      g_debug ("Moving files in cache for moved source files");
+      tumbler_util_dump_strv (G_LOG_DOMAIN, "From URIs",
+                              (const gchar *const *) request->from_uris);
+      tumbler_util_dump_strv (G_LOG_DOMAIN, "To URIs",
+                              (const gchar *const *) request->to_uris);
+
       tumbler_cache_move (service->cache, 
                           (const gchar *const *)request->from_uris, 
                           (const gchar *const *)request->to_uris);
@@ -364,6 +370,12 @@ tumbler_cache_service_copy_thread (gpointer data,
 
   if (service->cache != NULL)
     {
+      g_debug ("Copying files in cache for copied source files");
+      tumbler_util_dump_strv (G_LOG_DOMAIN, "From URIs",
+                              (const gchar *const *) request->from_uris);
+      tumbler_util_dump_strv (G_LOG_DOMAIN, "To URIs",
+                              (const gchar *const *) request->to_uris);
+
       tumbler_cache_copy (service->cache, 
                           (const gchar *const *)request->from_uris, 
                           (const gchar *const *)request->to_uris);
@@ -397,7 +409,12 @@ tumbler_cache_service_delete_thread (gpointer data,
   tumbler_mutex_lock (service->mutex);
 
   if (service->cache != NULL)
-    tumbler_cache_delete (service->cache, (const gchar *const *)request->uris);
+    {
+      g_debug ("Removing files from cache for deleted source files");
+      tumbler_util_dump_strv (G_LOG_DOMAIN, "URIs", (const gchar *const *) request->uris);
+
+      tumbler_cache_delete (service->cache, (const gchar *const *)request->uris);
+    }
 
   tumbler_exported_cache_service_complete_delete (request->skeleton, request->invocation);
 
@@ -427,6 +444,12 @@ tumbler_cache_service_cleanup_thread (gpointer data,
 
   if (service->cache != NULL)
     {
+      g_debug (request->since > 0 ? "Removing files older than %d from cache"
+                                  : "Removing files from cache regardless of mtime%.0d",
+               request->since);
+      tumbler_util_dump_strv (G_LOG_DOMAIN, "URI schemes",
+                              (const gchar *const *) request->base_uris);
+
       tumbler_cache_cleanup (service->cache, 
                              (const gchar *const *)request->base_uris, 
                              request->since);
diff --git a/tumblerd/tumbler-manager.c b/tumblerd/tumbler-manager.c
index 75557ff..ef9a0e0 100644
--- a/tumblerd/tumbler-manager.c
+++ b/tumblerd/tumbler-manager.c
@@ -340,7 +340,11 @@ tumbler_manager_register_cb (TumblerExportedManager *skeleton,
   g_return_val_if_fail (TUMBLER_IS_MANAGER (manager), FALSE);
   g_return_val_if_fail (uri_schemes != NULL, FALSE);
   g_return_val_if_fail (mime_types != NULL, FALSE);
-  
+
+  g_debug ("Registering new specialized thumbnailer");
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes", uri_schemes);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types", mime_types);
+
   sender_name = g_dbus_method_invocation_get_sender (invocation);
 
   tumbler_mutex_lock (manager->mutex);
@@ -1827,7 +1831,10 @@ dump_overrides (TumblerManager *manager)
   if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN))
     return;
 
-  string = g_string_new ("Overrides:\n");
+  if (g_hash_table_size (manager->overrides) == 0)
+    return;
+
+  string = g_string_new ("Specialized thumbnailer overrides:\n");
 
   g_hash_table_iter_init (&table_iter, manager->overrides);
   while (g_hash_table_iter_next (&table_iter, (gpointer) &hash_key, (gpointer) &list))
@@ -1856,7 +1863,10 @@ dump_thumbnailers (TumblerManager *manager)
   if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN))
     return;
 
-  string = g_string_new ("Thumbnailers:\n");
+  if (g_hash_table_size (manager->thumbnailers) == 0)
+    return;
+
+  string = g_string_new ("Specialized thumbnailers:\n");
 
   g_hash_table_iter_init (&table_iter, manager->thumbnailers);
   while (g_hash_table_iter_next (&table_iter, (gpointer) &base_name, (gpointer) &list))
diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c
index de48e16..7ae4f16 100644
--- a/tumblerd/tumbler-registry.c
+++ b/tumblerd/tumbler-registry.c
@@ -45,9 +45,6 @@ static gint                tumbler_registry_compare                   (TumblerTh
 static GList              *tumbler_registry_lookup                    (TumblerRegistry    *registry,
                                                                        const gchar        *hash_key);
 
-/* debug */
-static void                dump_registry                              (TumblerRegistry *registry);
-
 
 
 struct _TumblerRegistryClass
@@ -126,28 +123,6 @@ tumbler_registry_finalize (GObject *object)
 
 
 static void
-dump_registry (TumblerRegistry *registry)
-{
-  GString *string;
-
-  if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN))
-    return;
-
-  string = g_string_new ("Registry:\n");
-
-  g_string_append_printf (string, "  Preferred Thumbnailers: %d\n",
-                          g_hash_table_size (registry->preferred_thumbnailers));
-  g_string_append_printf (string, "  Registry Thumbnailers: %d\n",
-                          g_hash_table_size (registry->thumbnailers));
-
-  g_string_truncate (string, string->len - 1);
-  g_debug ("%s", string->str);
-  g_string_free (string, TRUE);
-}
-
-
-
-static void
 tumbler_registry_remove_thumbnailer (const gchar        *key,
                                      GList             **list,
                                      TumblerThumbnailer *thumbnailer)
@@ -391,8 +366,6 @@ tumbler_registry_add (TumblerRegistry    *registry,
 
   g_strfreev (hash_keys);
 
-  dump_registry (registry);
-
   tumbler_mutex_unlock (registry->mutex);
 }
 
@@ -719,7 +692,5 @@ tumbler_registry_set_preferred (TumblerRegistry    *registry,
                            g_strdup (hash_key), g_object_ref (thumbnailer));
     }
 
-  dump_registry (registry);
-
   tumbler_mutex_unlock (registry->mutex);
 }
diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index 27e071d..94f06b5 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -438,6 +438,10 @@ tumbler_service_scheduler_error (TumblerScheduler   *scheduler,
   g_return_if_fail (origin != NULL && *origin != '\0');
   g_return_if_fail (TUMBLER_IS_SERVICE (service));
   
+  g_debug ("Error signal for job %d: Code %d, message: %s",
+           handle, error_code, message);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "URIs", failed_uris);
+
   info = g_slice_new0 (SchedulerIdleInfo);
 
   info->scheduler = g_object_ref (scheduler);
@@ -497,7 +501,9 @@ tumbler_service_scheduler_finished (TumblerScheduler *scheduler,
   g_return_if_fail (TUMBLER_IS_SCHEDULER (scheduler));
   g_return_if_fail (origin != NULL && *origin != '\0');
   g_return_if_fail (TUMBLER_IS_SERVICE (service));
-  
+
+  g_debug ("Finishing job %d\n", handle);
+
   info = g_slice_new0 (SchedulerIdleInfo);
 
   info->scheduler = g_object_ref (scheduler);
@@ -555,7 +561,10 @@ tumbler_service_scheduler_ready (TumblerScheduler   *scheduler,
   g_return_if_fail (origin != NULL && *origin != '\0');
   g_return_if_fail (uris != NULL && uris[0] != NULL && *uris[0] != '\0');
   g_return_if_fail (TUMBLER_IS_SERVICE (service));
-  
+
+  g_debug ("Ready signal for job %d", handle);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "URIs", uris);
+
   info = g_slice_new0 (SchedulerIdleInfo);
 
   info->scheduler = g_object_ref (scheduler);
@@ -610,6 +619,8 @@ tumbler_service_scheduler_started (TumblerScheduler *scheduler,
   g_return_if_fail (origin != NULL && *origin != '\0');
   g_return_if_fail (TUMBLER_IS_SERVICE (service));
 
+  g_debug ("Starting job %d", handle);
+
   info = g_slice_new0 (SchedulerIdleInfo);
 
   info->scheduler = g_object_ref (scheduler);
@@ -737,6 +748,9 @@ tumbler_service_queue_cb (TumblerExportedService  *skeleton,
   /* get the request handle */
   handle = scheduler_request->handle;
 
+  g_debug ("Handling request %d", handle);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "URIs", uris);
+
   /* iterate over all schedulers */
   for (iter = service->schedulers; iter != NULL; iter = iter->next)
     {
@@ -815,6 +829,8 @@ tumbler_service_dequeue_cb (TumblerExportedService  *skeleton,
 
   if (handle != 0) 
     {
+      g_debug ("Dequeuing files for job %d", handle);
+
       /* iterate over all available schedulers */
       for (iter = service->schedulers; iter != NULL; iter = iter->next)
         {