ITS#8131 improve back-meta logs

diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c
index 44892a879eaabe655fca4929af42958d7b7faa83..fb59be45cf80ee78ad5ba92adac58d8487eca0df 100644 (file)
--- a/servers/slapd/back-meta/conn.c
+++ b/servers/slapd/back-meta/conn.c
@@ -472,7 +472,8 @@ retry:;
                        rc = ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res );
                        switch ( rc ) {
                        case -1:
-                               rs->sr_err = LDAP_OTHER;
+                               rs->sr_err = LDAP_UNAVAILABLE;
+                               rs->sr_text = "Remote server down";
                                break;
 
                        case 0:
@@ -484,6 +485,7 @@ retry:;
                                        goto retry;
                                }
                                rs->sr_err = LDAP_OTHER;
+                               rs->sr_text = "Timeout, no more retries";
                                break;
 
                        default:
@@ -534,6 +536,8 @@ retry:;
 
                        } else {
                                rs->sr_err = LDAP_OTHER;
+                               rs->sr_text = "Unknown response to StartTLS request :"
+                                       " an ExtendedResposne is expected";
                        }
 
                        if ( res != NULL ) {
@@ -674,6 +678,12 @@ error_return:;
        }
 
        if ( rs->sr_err != LDAP_SUCCESS ) {
+               /* Get the error message and print it in TRACE mode */
+               if ( LogTest( LDAP_DEBUG_TRACE ) ) {
+                       Log4( LDAP_DEBUG_TRACE, ldap_syslog_level, "%s: meta_back_init_one_conn[%d] failed err=%d text=%s\n",
+                               op->o_log_prefix, candidate, rs->sr_err, rs->sr_text );
+               }
+
                rs->sr_err = slap_map_api2result( rs );
                if ( sendok & LDAP_BACK_SENDERR ) {
                        send_ldap_result( op, rs );
@@ -1583,12 +1593,12 @@ retry_lock2:;
                                        err = lerr;
 
                                        if ( lerr == LDAP_UNAVAILABLE && mt->mt_isquarantined != LDAP_BACK_FQ_NO ) {
-                                               Debug( LDAP_DEBUG_TRACE, "%s: meta_back_getconn[%d] quarantined err=%d\n",
-                                                       op->o_log_prefix, i, lerr );
+                                               Log4( LDAP_DEBUG_TRACE, ldap_syslog_level, "%s: meta_back_getconn[%d] quarantined err=%d text=%s\n",
+                                                       op->o_log_prefix, i, lerr, rs->sr_text );
 
                                        } else {
-                                               Debug( LDAP_DEBUG_ANY, "%s: meta_back_getconn[%d] failed err=%d\n",
-                                                       op->o_log_prefix, i, lerr );
+                                               Log4( LDAP_DEBUG_ANY, ldap_syslog, "%s: meta_back_getconn[%d] failed err=%d text=%s\n",
+                                                       op->o_log_prefix, i, lerr, rs->sr_text );
                                        }
 
                                        if ( META_BACK_ONERR_STOP( mi ) ) {

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 46049018545995b0df7113e0e00a37e705a684bb..af5593f6ad945b51f5e97cdf558abb337d4a2014 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -1526,8 +1526,9 @@ really_bad:;
                                                        Debug( LDAP_DEBUG_TRACE, "%s.\n", buf, 0, 0 );
        
                                                } else {
-                                                       Debug( LDAP_DEBUG_ANY, "%s (%s).\n",
-                                                               buf, ldap_err2string( candidates[ i ].sr_err ), 0 );
+                                                       Debug( LDAP_DEBUG_ANY, "%s (%s) text=\"%s\".\n",
+                                                               buf, ldap_err2string( candidates[ i ].sr_err ),
+                                                               candidates[ i ].sr_text ? candidates[i].sr_text : "" );
                                                }
                                        }