Commit dc0f90d3 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Set lock detector to DEFAULT, not NORUN.

Clean up some error handling
parent d50adf6d
......@@ -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 );
......
......@@ -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;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment