* Removed the transaction stuff (but left the log in). It wasn't working.

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 3c7f6cc297edcf54902d1825092b94acd62150d0..c4bcd50e5f56bbdc0207de66753d6299af858d98 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -54,6 +54,7 @@ int do_defrag = 0;
 void master_startup(void) {
        struct timeval tv;
        
+       lprintf(9, "master_startup() started\n");
        lprintf(7, "Opening databases\n");
        open_databases();
 
@@ -61,8 +62,6 @@ void master_startup(void) {
                defrag_databases();
        }
 
-       cdb_begin_transaction();
-
        check_ref_counts();
 
        lprintf(7, "Creating base rooms (if necessary)\n");
@@ -74,10 +73,11 @@ void master_startup(void) {
        lprintf(7, "Seeding the pseudo-random number generator...\n");
        gettimeofday(&tv, NULL);
        srand(tv.tv_usec);
-
-       cdb_end_transaction();
+       lprintf(9, "master_startup() finished\n");
 }
 
+
+
 /*
  * Cleanup routine to be called when the server is shutting down.
  */
@@ -95,7 +95,7 @@ void master_cleanup(void) {
        /* Run any cleanup routines registered by loadable modules */
        for (fcn = CleanupHookTable; fcn != NULL; fcn = fcn->next) {
                (*fcn->h_function_pointer)();
-               }
+       }
 
        /* Close databases */
        lprintf(7, "Closing databases\n");
@@ -108,7 +108,7 @@ void master_cleanup(void) {
        lprintf(3, "citserver: exiting.\n");
        fflush(stdout); fflush(stderr);
        exit(0);
-       }
+}
 
 
 /*