summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Boreham <dboreham@redhat.com>2005-04-18 18:14:02 +0000
committerDavid Boreham <dboreham@redhat.com>2005-04-18 18:14:02 +0000
commit25ed4bfad2045406d34d7516fac49593f91991d7 (patch)
tree2cbf0db0e49fd9725930864b5a85264f961d2dce
parentecff84560f99a21d289637b6848d6a5edfac5092 (diff)
downloadds-25ed4bfad2045406d34d7516fac49593f91991d7.tar.gz
ds-25ed4bfad2045406d34d7516fac49593f91991d7.tar.xz
ds-25ed4bfad2045406d34d7516fac49593f91991d7.zip
remove bogus logging fix bug#154261
-rw-r--r--ldap/servers/plugins/replication/repl5_inc_protocol.c2
-rw-r--r--ldap/servers/plugins/replication/repl5_tot_protocol.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/ldap/servers/plugins/replication/repl5_inc_protocol.c b/ldap/servers/plugins/replication/repl5_inc_protocol.c
index 58396240..8fbda9c0 100644
--- a/ldap/servers/plugins/replication/repl5_inc_protocol.c
+++ b/ldap/servers/plugins/replication/repl5_inc_protocol.c
@@ -450,7 +450,7 @@ repl5_inc_waitfor_async_results(result_data *rd)
/* Lock the structure to force memory barrier */
PR_Lock(rd->lock);
/* Are we caught up ? */
- slapi_log_error(SLAPI_LOG_FATAL, NULL,
+ slapi_log_error(SLAPI_LOG_REPL, NULL,
"repl5_inc_waitfor_async_results: %d %d\n",
rd->last_message_id_received, rd->last_message_id_sent, 0);
if (rd->last_message_id_received >= rd->last_message_id_sent)
diff --git a/ldap/servers/plugins/replication/repl5_tot_protocol.c b/ldap/servers/plugins/replication/repl5_tot_protocol.c
index 91acba1e..243663ef 100644
--- a/ldap/servers/plugins/replication/repl5_tot_protocol.c
+++ b/ldap/servers/plugins/replication/repl5_tot_protocol.c
@@ -187,7 +187,7 @@ static void repl5_tot_result_threadmain(void *param)
}
conn_get_error_ex(conn, &operation_code, &connection_error, &ldap_error_string);
- if (connection_error)
+ if (connection_error && connection_error != LDAP_TIMEOUT)
{
repl5_tot_log_operation_failure(connection_error,ldap_error_string,agmt_get_long_name(cb->prp->agmt));
}
@@ -277,8 +277,8 @@ repl5_tot_waitfor_async_results(callback_data *cb_data)
/* Lock the structure to force memory barrier */
PR_Lock(cb_data->lock);
/* Are we caught up ? */
- slapi_log_error(SLAPI_LOG_FATAL, NULL,
- "repl5_inc_waitfor_async_results: %d %d\n",
+ slapi_log_error(SLAPI_LOG_REPL, NULL,
+ "repl5_tot_waitfor_async_results: %d %d\n",
cb_data->last_message_id_received, cb_data->last_message_id_sent, 0);
if (cb_data->last_message_id_received >= cb_data->last_message_id_sent)
{