chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Quieten over-pick compiler.
[disorder]
/
server
/
stats.c
diff --git
a/server/stats.c
b/server/stats.c
index d125caf8e3ca1b9f6110c3970d20515d71561ed8..5648ca057a106fae3e0cee75a5190d2a39ca2787 100644
(file)
--- a/
server/stats.c
+++ b/
server/stats.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder
/*
* This file is part of DisOrder
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007
, 2008
Richard Kettlewell
*
* 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
*
* 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
@@
-26,13
+26,17
@@
#include <errno.h>
#include <pcre.h>
#include <getopt.h>
#include <errno.h>
#include <pcre.h>
#include <getopt.h>
+#include <syslog.h>
+#include <unistd.h>
#include "defs.h"
#include "mem.h"
#include "log.h"
#include "syscalls.h"
#include "configuration.h"
#include "defs.h"
#include "mem.h"
#include "log.h"
#include "syscalls.h"
#include "configuration.h"
+#include "rights.h"
#include "trackdb.h"
#include "trackdb.h"
+#include "version.h"
static const struct option options[] = {
{ "help", no_argument, 0, 'h' },
static const struct option options[] = {
{ "help", no_argument, 0, 'h' },
@@
-40,6
+44,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
+58,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();
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
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:dD
Ss
", 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;
+ case 'S': logsyslog = 0; break;
+ case 's': logsyslog = 1; break;
default: fatal(0, "invalid option");
}
}
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");
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++);
stats = trackdb_stats(0);
while(*stats)
xprintf("%s\n", *stats++);