X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/d6dde5a3f49c7036a73f835fac1ece3144397fb7..a69fcd7a36d565697b0184a7ee0f51585e9a873d:/server/stats.c diff --git a/server/stats.c b/server/stats.c index d125caf..44558eb 100644 --- a/server/stats.c +++ b/server/stats.c @@ -26,12 +26,15 @@ #include #include #include +#include +#include #include "defs.h" #include "mem.h" #include "log.h" #include "syscalls.h" #include "configuration.h" +#include "rights.h" #include "trackdb.h" static const struct option options[] = { @@ -40,6 +43,8 @@ static const struct option options[] = { { "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 } }; @@ -52,6 +57,7 @@ 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" + " --[no-]syslog Force logging\n" "\n" "Generate DisOrder database statistics.\n"); xfclose(stdout); @@ -60,32 +66,38 @@ static void help(void) { /* display version number and terminate */ static void version(void) { - xprintf("disorder-stats version %s\n", disorder_version_string); + xprintf("%s", disorder_version_string); xfclose(stdout); exit(0); } int main(int argc, char **argv) { - int n; + int n, logsyslog = !isatty(2); 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) { + while((n = getopt_long(argc, argv, "hVc:dDSs", options, 0)) >= 0) { switch(n) { case 'h': help(); case 'V': version(); case 'c': configfile = optarg; break; case 'd': debugging = 1; break; case 'D': debugging = 0; break; + case 'S': logsyslog = 0; break; + case 's': logsyslog = 1; break; default: fatal(0, "invalid option"); } } + if(logsyslog) { + openlog(progname, LOG_PID, LOG_DAEMON); + log_default = &log_syslog; + } if(config_read(0)) fatal(0, "cannot read configuration"); - trackdb_init(0); - trackdb_open(); + trackdb_init(TRACKDB_NO_RECOVER); + trackdb_open(TRACKDB_NO_UPGRADE); stats = trackdb_stats(0); while(*stats) xprintf("%s\n", *stats++);