remove pointless "lost track of ... messages" warnings
it doesn't really add any value when resuming after an interruption, as
incomplete propagations are perfectly expected, and are recovered from.
but it does make sense in the non-UIDPLUS path, where not finding just
stored messages indicates a problem.
so move the reporting from match_tuids() to msgs_found_new(), and remove
a redundant warning from the latter.
amends 6577bf3e
.
This commit is contained in:
parent
2b797fac61
commit
254d2be9f4
16
src/sync.c
16
src/sync.c
|
@ -283,7 +283,7 @@ assign_tuid( sync_vars_t *svars, sync_rec_t *srec )
|
||||||
JLOG( "# %u %u %." stringify(TUIDL) "s", (srec->uid[F], srec->uid[N], srec->tuid), "new TUID" );
|
JLOG( "# %u %u %." stringify(TUIDL) "s", (srec->uid[F], srec->uid[N], srec->tuid), "new TUID" );
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static int
|
||||||
match_tuids( sync_vars_t *svars, int t, message_t *msgs )
|
match_tuids( sync_vars_t *svars, int t, message_t *msgs )
|
||||||
{
|
{
|
||||||
sync_rec_t *srec;
|
sync_rec_t *srec;
|
||||||
|
@ -324,8 +324,7 @@ match_tuids( sync_vars_t *svars, int t, message_t *msgs )
|
||||||
ASSIGN_UID( srec, t, tmsg->uid, "TUID matched %s", diag );
|
ASSIGN_UID( srec, t, tmsg->uid, "TUID matched %s", diag );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (num_lost)
|
return num_lost;
|
||||||
warn( "Warning: lost track of %d %sed message(s)\n", num_lost, str_hl[t] );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -2161,15 +2160,10 @@ static void
|
||||||
msgs_found_new( int sts, message_t *msgs, void *aux )
|
msgs_found_new( int sts, message_t *msgs, void *aux )
|
||||||
{
|
{
|
||||||
SVARS_CHECK_RET;
|
SVARS_CHECK_RET;
|
||||||
switch (sts) {
|
|
||||||
case DRV_OK:
|
|
||||||
debug( "matching just copied messages on %s\n", str_fn[t] );
|
debug( "matching just copied messages on %s\n", str_fn[t] );
|
||||||
break;
|
int num_lost = match_tuids( svars, t, msgs );
|
||||||
default:
|
if (num_lost)
|
||||||
warn( "Warning: cannot find newly stored messages on %s.\n", str_fn[t] );
|
warn( "Warning: lost track of %d %sed message(s)\n", num_lost, str_hl[t] );
|
||||||
break;
|
|
||||||
}
|
|
||||||
match_tuids( svars, t, msgs );
|
|
||||||
msgs_new_done( svars, t );
|
msgs_new_done( svars, t );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user