* Updated the citserver and webcit initialization banners to output a copyright date...

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index cfb7ce64f0a4bbde9b7fc92c2bf6e9d15bf1d033..0321eeedc8909cb2b55a1fd68b64715ac2a54244 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,7 +1,23 @@
 /*
+ * $Id$
+ *
  * citserver's main() function lives here.
+ * 
+ * Copyright (c) 1987-2010 by the citadel.org team
  *
- * $Id$
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -55,7 +71,9 @@
 #include "user_ops.h"
 #include "housekeeping.h"
 #include "svn_revision.h"
-#include "citadel_dirs.c"
+#include "citadel_dirs.h"
+
+#include "context.h"
 
 #include "modules_init.h"
 #include "ecrash.h"
@@ -71,8 +89,6 @@ const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
 
 
-extern struct CitContext masterCC;
-
 
 void go_threading(void);
 
@@ -99,6 +115,13 @@ int main(int argc, char **argv)
        eCrashParameters params;
 //     eCrashSymbolTable symbol_table;
 #endif
+
+#ifdef HAVE_GC
+       GC_INIT();
+       GC_find_leak = 1;
+#endif
+
+
        /* initialise semaphores here. Patch by Matt and davew
         * its called here as they are needed by CtdlLogPrintf for thread safety
         */
@@ -121,6 +144,11 @@ int main(int argc, char **argv)
                        running_as_daemon = 1;
                }
 
+               /* run a few stats if -s was specified */
+               else if (!strncmp(argv[a], "-s", 2)) {
+                       statcount = atoi(&argv[a][2]);
+               }
+
                /* -x specifies the desired logging level */
                else if (!strncmp(argv[a], "-x", 2)) {
                        verbosity = atoi(&argv[a][2]);
@@ -133,7 +161,6 @@ int main(int argc, char **argv)
                        else
                                safestrncpy(relhome, &argv[a][2],
                                                        sizeof relhome);
-                       home_specified = 1;
                        home=1;
                }
 
@@ -156,7 +183,7 @@ int main(int argc, char **argv)
                        CtdlLogPrintf(CTDL_EMERG,       "citserver: usage: "
                                        "citserver "
                                        "[-lLogFacility] "
-                                       "[-d] [-D] "
+                                       "[-d] [-D] [-s]"
                                        " [-tTraceFile]"
                                        " [-xLogLevel] [-hHomeDir]\n");
                        exit(1);
@@ -203,7 +230,7 @@ int main(int argc, char **argv)
        CtdlLogPrintf(CTDL_NOTICE,
                "*** Citadel server engine v%d.%02d (build %s) ***\n",
                (REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
-       CtdlLogPrintf(CTDL_NOTICE, "Copyright (C) 1987-2008 by the Citadel development team.\n");
+       CtdlLogPrintf(CTDL_NOTICE, "Copyright (C) 1987-2010 by the Citadel development team.\n");
        CtdlLogPrintf(CTDL_NOTICE, "This program is distributed under the terms of the GNU "
                                        "General Public License.\n");
        CtdlLogPrintf(CTDL_NOTICE, "\n");
@@ -249,18 +276,26 @@ int main(int argc, char **argv)
         */
        master_startup();
 
+       /*
+        * Check that the control record is correct and place sensible values if it isn't
+        */
+       check_control();
        
-/*
- * Initialise the user 0 to have a name. It would be nice to do it in InitializeMasterCC
- * since it is contained within the MasterCC but we can't because the DB isn't available
- * at that time so we do it seperate.
+       /*
+        * Run any upgrade entry points
+        */
+       CtdlLogPrintf(CTDL_INFO, "Upgrading modules.\n");
+       upgrade_modules();
+       
+/**
+ * Load the user for the masterCC or create them if they don't exist
  */
-       /** Give user 0 a name and create them if necessary */
-       if (getuser(&masterCC.user, "Citadel"))
+       if (CtdlGetUser(&masterCC.user, "SYS_Citadel"))
        {
-               getuserbynumber(&masterCC.user, 0);
-               strcpy (masterCC.user.fullname, "Citadel");
-               putuser(&masterCC.user);
+               /** User doesn't exist. We can't use create user here as the user number needs to be 0 */
+               strcpy (masterCC.user.fullname, "SYS_Citadel") ;
+               CtdlPutUser(&masterCC.user);
+               CtdlGetUser(&masterCC.user, "SYS_Citadel"); /** Just to be safe */
        }
        
        /*
@@ -284,11 +319,6 @@ int main(int argc, char **argv)
                                CitadelServiceTCP);
 
                                
-       /*
-        * Run any upgrade entry points
-        */
-       CtdlLogPrintf(CTDL_INFO, "Upgrading modules.\n");
-       upgrade_modules();
        
        
        /*
@@ -308,6 +338,14 @@ int main(int argc, char **argv)
                start_chkpwd_daemon();
        }
 
+
+       /*
+        * check, whether we're fired up another time after a crash.
+        * if, post an aide message, so the admin has a chance to react.
+        */
+       checkcrash ();
+
+
        /*
         * Now that we've bound the sockets, change to the Citadel user id and its
         * corresponding group ids