Added/Modified LDAP_LOG messages to match the existing Debug messages

diff --git a/servers/slapd/back-bdb/error.c b/servers/slapd/back-bdb/error.c
index c2e980ed2818ecccb2c719347dc182393c5e7279..ba96309a390940ed192a23323aaa66ea22ac7cd7 100644 (file)
--- a/servers/slapd/back-bdb/error.c
+++ b/servers/slapd/back-bdb/error.c
@@ -15,5 +15,9 @@
 
 void bdb_errcall( const char *pfx, char * msg )
 {
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "error", LDAP_LEVEL_INFO, "bdb(%s): %s\n", pfx, msg ));
+#else
        Debug( LDAP_DEBUG_ANY, "bdb(%s): %s\n", pfx, msg, 0 );
+#endif
 }

diff --git a/servers/slapd/back-bdb/key.c b/servers/slapd/back-bdb/key.c
index 4c5d8d4f3363415db2a1c15cf349d45bb76eafb4..ea6433fa6eebf38301a286322ef24ab24c3ff452 100644 (file)
--- a/servers/slapd/back-bdb/key.c
+++ b/servers/slapd/back-bdb/key.c
@@ -43,7 +43,7 @@ bdb_key_read(
 
        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
+               LDAP_LOG(( "index", LDAP_LEVEL_ERR,
                        "bdb_key_read: failed (%d)\n",
                        rc ));
 #else
@@ -52,7 +52,7 @@ bdb_key_read(
 #endif
        } else {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
+               LDAP_LOG(( "index", LDAP_LEVEL_DETAIL1,
                        "bdb_key_read: %ld candidates\n", (long) BDB_IDL_N(ids) ));
 #else
                Debug( LDAP_DEBUG_TRACE, "<= bdb_index_read %ld candidates\n",
@@ -78,7 +78,7 @@ bdb_key_change(
        DBT     key;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
+       LDAP_LOG(( "index", LDAP_LEVEL_DETAIL1,
                "key_change: %s ID %lx\n",
                op == SLAP_INDEX_ADD_OP ? "Add" : "Delete", (long) id ));
 #else
@@ -99,7 +99,7 @@ bdb_key_change(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
+       LDAP_LOG(( "index", LDAP_LEVEL_RESULTS,
                "key_change: return %d\n", rc ));
 #else
        Debug( LDAP_DEBUG_TRACE, "<= key_change %d\n", rc, 0, 0 );