mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 05:45:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

improved logging

Browse source
This commit is contained in:
Christian Jann 2011-04-06 17:05:31 +02:00
parent e4d8e793f6
commit d842119065
3 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/csync_propagate.c
View file

@ -385,9 +385,9 @@ static int _backup_path(char** duri, const char* uri, const char* path)
strftime(timestring, 16, "%Y%m%d-%H%M%S",curtime);
info=c_split_path(path);
printf("directory: %s\n",info->directory);
printf("filename : %s\n",info->filename);
printf("extension: %s\n",info->extension);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"directory: %s",info->directory);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"filename : %s",info->filename);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"extension: %s",info->extension);
if (asprintf(duri, "%s/%s%s_conflict-%s%s", uri,info->directory ,info->filename,timestring,info->extension) < 0) {
rc = -1;
@ -414,7 +414,7 @@ static int _csync_backup_file(CSYNC *ctx, csync_file_stat_t *st) {
if(st->instruction==CSYNC_INSTRUCTION_CONFLICT)
{
//printf("CSYNC_INSTRUCTION_CONFLICT\n");
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"CSYNC_INSTRUCTION_CONFLICT");
switch (ctx->current) {
case LOCAL_REPLICA:
srep = ctx->remote.type;
@ -449,13 +449,13 @@ static int _csync_backup_file(CSYNC *ctx, csync_file_stat_t *st) {
else
{
printf("instruction not allowed: %i %s\n",st->instruction,csync_instruction_str(st->instruction));
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"instruction not allowed: %i %s",st->instruction,csync_instruction_str(st->instruction));
rc = -1;
goto out;
}
printf("suri: %s\n",suri);
printf("duri: %s\n",duri);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"suri: %s",suri);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"duri: %s",duri);
/* rename the older file to conflict */
@ -918,7 +918,7 @@ static int _csync_propagation_file_visitor(void *obj, void *data) {
}
break;
case CSYNC_INSTRUCTION_CONFLICT:
printf("case CSYNC_INSTRUCTION_CONFLICT: %s\n",st->path);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"case CSYNC_INSTRUCTION_CONFLICT: %s",st->path);
if (_csync_conflict_file(ctx, st) < 0) {
goto err;
}
@ -969,7 +969,7 @@ static int _csync_propagation_dir_visitor(void *obj, void *data) {
}
break;
case CSYNC_INSTRUCTION_CONFLICT:
printf("directory conflict\n");
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"directory conflict");
if (_csync_sync_dir(ctx, st) < 0) {
goto err;
}

16
src/csync_reconcile.c
View file

@ -94,7 +94,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
if(ctx->options.with_conflict_copys)
{
printf("file new on both, cur is newer PATH=./%s\n",cur->path);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"file new on both, cur is newer PATH=./%s",cur->path);
cur->instruction = CSYNC_INSTRUCTION_CONFLICT;
other->instruction = CSYNC_INSTRUCTION_NONE;
}
@ -108,7 +108,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
if(ctx->options.with_conflict_copys)
{
printf("file new on both, other is newer PATH=./%s\n",cur->path);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"file new on both, other is newer PATH=./%s",cur->path);
cur->instruction = CSYNC_INSTRUCTION_NONE;
other->instruction = CSYNC_INSTRUCTION_CONFLICT;
}
@ -131,7 +131,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
if(ctx->options.with_conflict_copys)
{
printf("new on cur, modified on other, cur is newer PATH=./%s\n",cur->path);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"new on cur, modified on other, cur is newer PATH=./%s",cur->path);
cur->instruction = CSYNC_INSTRUCTION_CONFLICT;
}
else
@ -144,7 +144,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
if(ctx->options.with_conflict_copys)
{
printf("new on cur, modified on other, other is newer PATH=./%s\n",cur->path);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"new on cur, modified on other, other is newer PATH=./%s",cur->path);
cur->instruction = CSYNC_INSTRUCTION_NONE;
}
else
@ -171,7 +171,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
if(ctx->options.with_conflict_copys)
{
printf("modified on cur, new on other, cur is newer PATH=./%s\n",cur->path);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"modified on cur, new on other, cur is newer PATH=./%s",cur->path);
cur->instruction = CSYNC_INSTRUCTION_CONFLICT;
}
else
@ -183,7 +183,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
if(ctx->options.with_conflict_copys)
{
printf("modified on cur, new on other, other is newer PATH=./%s\n",cur->path);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"modified on cur, new on other, other is newer PATH=./%s",cur->path);
cur->instruction = CSYNC_INSTRUCTION_NONE;
}
else
@ -199,7 +199,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
if(ctx->options.with_conflict_copys)
{
printf("both modified, cur is newer PATH=./%s\n",cur->path);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"both modified, cur is newer PATH=./%s",cur->path);
cur->instruction = CSYNC_INSTRUCTION_CONFLICT;
other->instruction= CSYNC_INSTRUCTION_NONE;
}
@ -213,7 +213,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
if(ctx->options.with_conflict_copys)
{
printf("both modified, other is newer PATH=./%s\n",cur->path);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"both modified, other is newer PATH=./%s",cur->path);
cur->instruction = CSYNC_INSTRUCTION_NONE;
other->instruction=CSYNC_INSTRUCTION_CONFLICT;
}

7
src/std/c_path.c
View file

@ -445,12 +445,11 @@ C_PATHINFO * c_split_path(const char* pathSrc)
len=strlen(pathinfo->filename);
if(len>1)
{
printf("len: %i\n",(int)len);
printf("%i %i\n",pathinfo->filename[len-1],pathinfo->filename[len-1]);
printf("%i %i\n",'~','~');
//printf("%i\n",pathinfo->filename[len-1]);
//printf("%i\n",'~');
if(pathinfo->filename[len-1]=='~')
{
printf("kate file found\n");
//printf("kate file found\n");
pathinfo->filename[len-1]='\0'; // Truncate filename
pathinfo->extension[0]='~';
}