mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 17:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Disable the blacklist by default

Browse source 
The blacklist might hide errors and reduce the ability to do proper
diagnostics.

Note that in _csync_push_file, we kept csync_statedb_get_progressinfo
because it is also used for the resume feature

Also added output when a file has been blacklisted.
This commit is contained in:
Olivier Goffart 2013-06-18 18:15:43 +02:00
parent ed76e5f1f2
commit 3d2c3b321c
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/CMakeLists.txt
View file

@ -48,6 +48,13 @@ if(ICONV_FOUND AND WITH_ICONV)
list(APPEND CSYNC_LINK_LIBRARIES ${ICONV_LIBRARIES})
endif()
set(BLACKLIST_ON_ERROR 0 CACHE BOOL
"If an errors occurs three times on the same file, do not attempt to process that file any further.")
if(BLACKLIST_ON_ERROR)
add_definitions(-DBLACKLIST_ON_ERROR)
endif()
set(csync_SRCS
csync.c
csync_config.c

25
src/csync_propagate.c
View file

@ -163,10 +163,15 @@ static int _csync_push_file(CSYNC *ctx, csync_file_stat_t *st) {
progress_info = csync_statedb_get_progressinfo(ctx, st->phash, st->modtime, st->md5);
rep_bak = ctx->replica;
#ifdef BLACKLIST_ON_ERROR
if (progress_info && progress_info->error > 3) {
CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR,
"'%s' was blacklisted after %d errors: %s",
st->path, progress_info->error, progress_info->error_string);
rc = 1;
goto out;
}
#endif
if (progress_info) {
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,
@ -805,9 +810,13 @@ static int _csync_rename_file(CSYNC *ctx, csync_file_stat_t *st) {
if(node)
other = (csync_file_stat_t *) node->data;
#ifdef BLACKLIST_ON_ERROR
if (other) {
pi = csync_statedb_get_progressinfo(ctx, other->phash, other->modtime, other->md5);
if (pi && pi->error > 3) {
CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR,
"'%s' was blacklisted after %d errors: %s",
st->path, pi->error, pi->error_string);
if (!st->error_string && pi->error_string)
st->error_string = c_strdup(pi->error_string);
if (!other->error_string && pi->error_string)
@ -816,6 +825,7 @@ static int _csync_rename_file(CSYNC *ctx, csync_file_stat_t *st) {
goto out;
}
}
#endif
switch (ctx->current) {
case REMOTE_REPLICA:
@ -973,13 +983,18 @@ static int _csync_remove_file(CSYNC *ctx, csync_file_stat_t *st) {
int rc = -1;
csync_progressinfo_t *pi = NULL;
#ifdef BLACKLIST_ON_ERROR
pi = csync_statedb_get_progressinfo(ctx, st->phash, st->modtime, st->md5);
if (pi && pi->error > 3) {
CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR,
"'%s' was blacklisted after %d errors: %s",
st->path, pi->error, pi->error_string);
rc = 1;
if (!st->error_string && pi->error_string)
st->error_string = c_strdup(pi->error_string);
goto out;
}
#endif
switch (ctx->current) {
@ -1044,13 +1059,18 @@ static int _csync_new_dir(CSYNC *ctx, csync_file_stat_t *st) {
int rc = -1;
csync_progressinfo_t *pi = NULL;
#ifdef BLACKLIST_ON_ERROR
pi = csync_statedb_get_progressinfo(ctx, st->phash, st->modtime, st->md5);
if (pi && pi->error > 3) {
CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR,
"'%s' was blacklisted after %d errors: %s",
st->path, pi->error, pi->error_string);
if (!st->error_string && pi->error_string)
st->error_string = c_strdup(pi->error_string);
rc = 1;
goto out;
}
#endif
replica_bak = ctx->replica;
@ -1148,13 +1168,18 @@ static int _csync_sync_dir(CSYNC *ctx, csync_file_stat_t *st) {
int rc = -1;
csync_progressinfo_t *pi = NULL;
#ifdef BLACKLIST_ON_ERROR
pi = csync_statedb_get_progressinfo(ctx, st->phash, st->modtime, st->md5);
if (pi && pi->error > 3) {
CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR,
"'%s' was blacklisted after %d errors: %s",
st->path, pi->error, pi->error_string);
if (!st->error_string && pi->error_string)
st->error_string = c_strdup(pi->error_string);
rc = 1;
goto out;
}
#endif
replica_bak = ctx->replica;