* 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 d249e345c7ae227e764e9ab9ce14de83cdb9b156..c4bcd50e5f56bbdc0207de66753d6299af858d98 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -54,13 +54,14 @@ int do_defrag = 0;
 void master_startup(void) {
        struct timeval tv;
        
+       lprintf(9, "master_startup() started\n");
        lprintf(7, "Opening databases\n");
        open_databases();
 
-       if (do_defrag)
+       if (do_defrag) {
                defrag_databases();
+       }
 
-       lprintf(7, "Checking floor reference counts\n");
        check_ref_counts();
 
        lprintf(7, "Creating base rooms (if necessary)\n");
@@ -69,13 +70,14 @@ void master_startup(void) {
        create_room(SYSCONFIGROOM,      3, "", 0);
        create_room(config.c_twitroom,  0, "", 0);
 
-/* Seed the PRNG */
-       
        lprintf(7, "Seeding the pseudo-random number generator...\n");
        gettimeofday(&tv, NULL);
        srand(tv.tv_usec);
+       lprintf(9, "master_startup() finished\n");
 }
 
+
+
 /*
  * Cleanup routine to be called when the server is shutting down.
  */
@@ -93,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");
@@ -106,7 +108,7 @@ void master_cleanup(void) {
        lprintf(3, "citserver: exiting.\n");
        fflush(stdout); fflush(stderr);
        exit(0);
-       }
+}
 
 
 /*
@@ -192,7 +194,7 @@ void RemoveContext (struct CitContext *con)
        lprintf(3, "citserver[%3d]: ended.\n", con->cs_pid);
        
 
-       syslog(LOG_NOTICE,"session %d ended", con->cs_pid);
+       syslog(LOG_NOTICE,"session %d: ended", con->cs_pid);
        
        /* Deallocate any user-data attached to this session */
        deallocate_user_data(con);
@@ -201,10 +203,7 @@ void RemoveContext (struct CitContext *con)
        lprintf(7, "Closing socket %d\n", con->client_socket);
        close(con->client_socket);
 
-        /* Tell the housekeeping thread to check to see if this is the time
-         * to initiate a scheduled shutdown event.
-         */
-        enter_housekeeping_cmd("SCHED_SHUTDOWN");
+       /* This is where we used to check for scheduled shutdowns. */
 
        /* Free up the memory used by this context */
        phree(con);
@@ -460,12 +459,14 @@ void cmd_iden(char *argbuf)
                (rev_level % 100),
                desc);
 
-       syslog(LOG_NOTICE,"client %d/%d/%01d.%02d (%s)\n",
+       syslog(LOG_NOTICE,"session %d: client %d/%d/%01d.%02d (%s) from %s\n",
+               CC->cs_pid,
                dev_code,
                cli_code,
                (rev_level / 100),
                (rev_level % 100),
-               desc);
+               desc,
+               CC->cs_host);
        cprintf("%d Ok\n",OK);
 }