[Pkg-owncloud-commits] [owncloud-client] 420/498: Reconcile: Improve debug output

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit cdb556e404fa81c0d692ebcbe8c7a3bff7a8986a
Author: Markus Goetz <markus at woboq.com>
Date:   Fri Jul 31 16:43:30 2015 +0200

    Reconcile: Improve debug output
---
 csync/src/csync_reconcile.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/csync/src/csync_reconcile.c b/csync/src/csync_reconcile.c
index b4256b3..8fb295f 100644
--- a/csync/src/csync_reconcile.c
+++ b/csync/src/csync_reconcile.c
@@ -298,20 +298,23 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
 
     //hide instruction NONE messages when log level is set to debug,
     //only show these messages on log level trace
+    const char *repo = ctx->current == REMOTE_REPLICA ? "server" : "client";
     if(cur->instruction ==CSYNC_INSTRUCTION_NONE)
     {
         if(cur->type == CSYNC_FTW_TYPE_DIR)
         {
             CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,
-                      "%-20s  dir: %s",
+                      "%-20s %s dir:  %s",
                       csync_instruction_str(cur->instruction),
+                      repo,
                       cur->path);
         }
         else
         {
             CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,
-                      "%-20s file: %s",
+                      "%-20s %s file: %s",
                       csync_instruction_str(cur->instruction),
+                      repo,
                       cur->path);
         }
     }
@@ -320,15 +323,17 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
         if(cur->type == CSYNC_FTW_TYPE_DIR)
         {
             CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-                      "%-20s  dir: %s",
+                      "%-20s %s dir:  %s",
                       csync_instruction_str(cur->instruction),
+                      repo,
                       cur->path);
         }
         else
         {
             CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-                      "%-20s file: %s",
+                      "%-20s %s file: %s",
                       csync_instruction_str(cur->instruction),
+                      repo,
                       cur->path);
         }
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git