mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added LDAP_LOG messages

Browse Source
This commit is contained in:
Julius Enarusai 2002-03-26 22:40:31 +00:00
parent 82cd035505
commit 5f154f2e57
1 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
servers/slapd/back-bdb/tools.c
View File

@ -127,8 +127,14 @@ ID bdb_tool_entry_put(
assert( text->bv_val );
assert( text->bv_val[0] == '\0' );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ARGS,
"=> bdb_tool_entry_put( %ld, \"%s\" )\n",
(long) e->e_id, e->e_dn ));
#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_put( %ld, \"%s\" )\n",
(long) e->e_id, e->e_dn, 0 );
#endif
rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &tid,
bdb->bi_db_opflags );
@ -136,9 +142,14 @@ ID bdb_tool_entry_put(
snprintf( text->bv_val, text->bv_len,
"txn_begin failed: %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n",
text->bv_val, 0, 0 );
#endif
return NOID;
}
@ -147,8 +158,13 @@ ID bdb_tool_entry_put(
snprintf( text->bv_val, text->bv_len,
"next_id failed: %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
#endif
goto done;
}
@ -163,8 +179,13 @@ ID bdb_tool_entry_put(
snprintf( text->bv_val, text->bv_len,
"dn2id_add failed: %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
#endif
goto done;
}
@ -174,8 +195,13 @@ ID bdb_tool_entry_put(
snprintf( text->bv_val, text->bv_len,
"id2entry_add failed: %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
#endif
goto done;
}
@ -184,8 +210,13 @@ ID bdb_tool_entry_put(
snprintf( text->bv_val, text->bv_len,
"index_entry_add failed: %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
#endif
goto done;
}
@ -196,9 +227,14 @@ done:
snprintf( text->bv_val, text->bv_len,
"txn_commit failed: %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n",
text->bv_val, 0, 0 );
#endif
e->e_id = NOID;
}
@ -207,9 +243,14 @@ done:
snprintf( text->bv_val, text->bv_len,
"txn_aborted! %s (%d)",
db_strerror(rc), rc );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_put: %s\n", text->bv_val ));
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_put: %s\n",
text->bv_val, 0, 0 );
#endif
e->e_id = NOID;
}
@ -226,23 +267,40 @@ int bdb_tool_entry_reindex(
DB_TXN *tid = NULL;
struct berval pdn;
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ARGS,
"=> bdb_tool_entry_reindex( %ld )\n", (long) id ));
#else
Debug( LDAP_DEBUG_ARGS, "=> bdb_tool_entry_reindex( %ld )\n",
(long) id, 0, 0 );
#endif
e = bdb_tool_entry_get( be, id );
if( e == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_DETAIL1,
"bdb_tool_entry_reindex:: could not locate id=%ld\n",
(long) id ));
#else
Debug( LDAP_DEBUG_ANY,
"bdb_tool_entry_reindex:: could not locate id=%ld\n",
(long) id, 0, 0 );
#endif
return -1;
}
rc = TXN_BEGIN( bi->bi_dbenv, NULL, &tid, bi->bi_db_opflags );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_reindex: txn_begin failed: %s (%d)\n",
db_strerror(rc), rc ));
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_reindex: txn_begin failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#endif
goto done;
}
@ -253,8 +311,14 @@ int bdb_tool_entry_reindex(
*
*/
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_reindex( %ld, \"%s\" )\n",
(long) id, e->e_dn ));
#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_reindex( %ld, \"%s\" )\n",
(long) id, e->e_dn, 0 );
#endif
/* add dn2id indices */
if ( be_issuffix( be, &e->e_nname ) ) {
@ -264,9 +328,15 @@ int bdb_tool_entry_reindex(
}
rc = bdb_dn2id_add( be, tid, &pdn, e );
if( rc != 0 && rc != DB_KEYEXIST ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_reindex: dn2id_add failed: %s (%d)\n",
db_strerror(rc), rc ));
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_reindex: dn2id_add failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#endif
goto done;
}
@ -276,17 +346,29 @@ done:
if( rc == 0 ) {
rc = TXN_COMMIT( tid, 0 );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
"=> bdb_tool_entry_reindex: txn_commit failed: %s (%d)\n",
db_strerror(rc), rc ));
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_reindex: txn_commit failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
#endif
e->e_id = NOID;
}
} else {
TXN_ABORT( tid );
#ifdef NEW_LOGGING
LDAP_LOG (( "tools", LDAP_LEVEL_DETAIL1,
"=> bdb_tool_entry_reindex: txn_aborted! %s (%d)\n",
db_strerror(rc), rc ));
#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_entry_reindex: txn_aborted! %s (%d)\n",
db_strerror(rc), rc, 0 );
#endif
e->e_id = NOID;
}