Merge tag 'branchpoint-5.1' into release

[disorder] / server / stats.c

diff --git a/server/stats.c b/server/stats.c
index d125caf8e3ca1b9f6110c3970d20515d71561ed8..1ac1cd7a037ff2534b07abbbb0901fe7d9408789 100644 (file)
--- a/server/stats.c
+++ b/server/stats.c
@@ -1,38 +1,28 @@
 /*
  * This file is part of DisOrder
 /*
  * This file is part of DisOrder

- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007-2009 Richard Kettlewell

  *
  *

- * This program is free software; you can redistribute it and/or modify
+ * 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
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.
  *
  * (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.
- *
+ * 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
  * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** @file server/stats.c
+ * @brief Generate server statistics
+ *
+ * This is done in a subprogram because it can be quite slow and we don't want
+ * to wedge the rest of the server for the duration.

  */
 
  */
 

-#include <config.h>
-#include "types.h"
-
-#include <locale.h>
-#include <stdio.h>
-#include <errno.h>
-#include <pcre.h>
-#include <getopt.h>
-
-#include "defs.h"
-#include "mem.h"
-#include "log.h"
-#include "syscalls.h"
-#include "configuration.h"
-#include "trackdb.h"
+#include "disorder-server.h"

 
 static const struct option options[] = {
   { "help", no_argument, 0, 'h' },
 
 static const struct option options[] = {
   { "help", no_argument, 0, 'h' },


@@ -40,6 +30,8 @@ static const struct option options[] = {
   { "config", required_argument, 0, 'c' },
   { "debug", no_argument, 0, 'd' },
   { "no-debug", no_argument, 0, 'D' },
   { "config", required_argument, 0, 'c' },
   { "debug", no_argument, 0, 'd' },
   { "no-debug", no_argument, 0, 'D' },

+  { "syslog", no_argument, 0, 's' },
+  { "no-syslog", no_argument, 0, 'S' },

   { 0, 0, 0, 0 }
 };
 
   { 0, 0, 0, 0 }
 };
 


@@ -52,40 +44,40 @@ static void help(void) {
          "  --version, -V            Display version number\n"
          "  --config PATH, -c PATH   Set configuration file\n"
          "  --[no-]debug, -d         Turn on (off) debugging\n"
          "  --version, -V            Display version number\n"
          "  --config PATH, -c PATH   Set configuration file\n"
          "  --[no-]debug, -d         Turn on (off) debugging\n"

+          "  --[no-]syslog            Force logging\n"

          "\n"
          "Generate DisOrder database statistics.\n");
   xfclose(stdout);
   exit(0);
 }
 
          "\n"
          "Generate DisOrder database statistics.\n");
   xfclose(stdout);
   exit(0);
 }
 

-/* display version number and terminate */
-static void version(void) {
-  xprintf("disorder-stats version %s\n", disorder_version_string);
-  xfclose(stdout);
-  exit(0);
-}
-

 int main(int argc, char **argv) {
 int main(int argc, char **argv) {

-  int n;
+  int n, logsyslog = !isatty(2);

   char **stats;
 
   set_progname(argv);
   mem_init();
   char **stats;
 
   set_progname(argv);
   mem_init();

-  if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
-  while((n = getopt_long(argc, argv, "hVc:dD", options, 0)) >= 0) {
+  if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale");
+  while((n = getopt_long(argc, argv, "hVc:dDSs", options, 0)) >= 0) {

     switch(n) {
     case 'h': help();
     switch(n) {
     case 'h': help();

-    case 'V': version();
+    case 'V': version("disorder-stats");

     case 'c': configfile = optarg; break;
     case 'd': debugging = 1; break;
     case 'D': debugging = 0; break;
     case 'c': configfile = optarg; break;
     case 'd': debugging = 1; break;
     case 'D': debugging = 0; break;

-    default: fatal(0, "invalid option");
+    case 'S': logsyslog = 0; break;
+    case 's': logsyslog = 1; break;
+    default: disorder_fatal(0, "invalid option");

     }
   }
     }
   }

-  if(config_read(0))
-    fatal(0, "cannot read configuration");
-  trackdb_init(0);
-  trackdb_open();
+  if(logsyslog) {
+    openlog(progname, LOG_PID, LOG_DAEMON);
+    log_default = &log_syslog;
+  }
+  if(config_read(0, NULL))
+    disorder_fatal(0, "cannot read configuration");
+  trackdb_init(TRACKDB_NO_RECOVER);
+  trackdb_open(TRACKDB_NO_UPGRADE);

   stats = trackdb_stats(0);
   while(*stats)
     xprintf("%s\n", *stats++);
   stats = trackdb_stats(0);
   while(*stats)
     xprintf("%s\n", *stats++);