master_cleanup() is now the global shutdown/exit function

[citadel.git] / citadel / server / backends / berkeley_db / berkeley_db.c

diff --git a/citadel/server/backends/berkeley_db/berkeley_db.c b/citadel/server/backends/berkeley_db/berkeley_db.c
index 3d1a0261b1b5bbfb413ceef0226471e4b125d2ae..147446f6e0038452b74e885d537ed53bbdd0392f 100644 (file)
--- a/citadel/server/backends/berkeley_db/berkeley_db.c
+++ b/citadel/server/backends/berkeley_db/berkeley_db.c
@@ -244,7 +244,7 @@ void bdb_open_databases(void) {
                //exit(CTDLEXIT_DB);
        //}
 
-       flags = DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_INIT_TXN | DB_INIT_LOCK | DB_THREAD | DB_INIT_LOG;
+       flags = DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_INIT_TXN | /*DB_INIT_LOCK |*/ DB_THREAD | DB_INIT_LOG;
        syslog(LOG_DEBUG, "bdb: bdb_env->open(bdb_env, %s, %d, 0)", ctdl_db_dir, flags);
        ret = bdb_env->open(bdb_env, ctdl_db_dir, flags, 0);                            // try opening the database cleanly
        if (ret == DB_RUNRECOVERY) {
@@ -322,10 +322,13 @@ void bdb_close_databases(void) {
        }
 
        // Close the handle.
+       syslog(LOG_INFO, "bdb: closing environment");
        ret = bdb_env->close(bdb_env, DB_FORCESYNC);
        if (ret) {
                syslog(LOG_ERR, "bdb: DBENV->close: %s", db_strerror(ret));
        }
+
+       syslog(LOG_INFO, "bdb: shutdown completed");
 }