mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set lock detector to DEFAULT, not NORUN.

Browse Source 
Clean up some error handling
This commit is contained in:
Kurt Zeilenga 2002-01-21 08:19:28 +00:00
parent d50adf6de1
commit dc0f90d36d
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servers/slapd/back-bdb/init.c
View File

@ -79,7 +79,11 @@ bdb_db_init( BackendDB *be )
bdb->bi_txn = 1; /* default to using transactions */
#ifndef NO_THREADS
#if 0
bdb->bi_lock_detect = DB_LOCK_NORUN;
#else
bdb->bi_lock_detect = DB_LOCK_DEFAULT;
#endif
#endif
ldap_pvt_thread_mutex_init( &bdb->bi_database_mutex );
@ -356,7 +360,6 @@ bdb_db_destroy( BackendDB *be )
/* close db environment */
if( bdb->bi_dbenv ) {
/* force a checkpoint */
if( bdb->bi_txn ) {
rc = TXN_CHECKPOINT( bdb->bi_dbenv, 0, 0, DB_FORCE );

13
servers/slapd/backend.c
View File

@ -272,11 +272,11 @@ int backend_startup(Backend *be)
if(rc != 0) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"backend_startup: bi_db_open failed!\n" ));
"backend_startup: bi_db_open failed! (%d)\n", rc ));
#else
Debug( LDAP_DEBUG_ANY,
"backend_startup: bi_db_open failed!\n",
0, 0, 0 );
"backend_startup: bi_db_open failed! (%d)\n",
rc, 0, 0 );
#endif
return rc;
}
@ -322,11 +322,12 @@ int backend_startup(Backend *be)
if(rc != 0) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"backend_startup: bi_db_open %d failed!\n", i ));
"backend_startup: bi_db_open(%d) failed! (%d)\n",
i, rc ));
#else
Debug( LDAP_DEBUG_ANY,
"backend_startup: bi_db_open %d failed!\n",
i, 0, 0 );
"backend_startup: bi_db_open(%d) failed! (%d)\n",
i, rc, 0 );
#endif
return rc;
}