chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client.c remembers last response string
[disorder]
/
server
/
deadlock.c
diff --git
a/server/deadlock.c
b/server/deadlock.c
index aa29b419e89d115458dbebf3f386cf7159dac175..99359b261b5980100fab439710a0f5a87755d06d 100644
(file)
--- a/
server/deadlock.c
+++ b/
server/deadlock.c
@@
-39,6
+39,7
@@
#include "defs.h"
#include "mem.h"
#include "kvp.h"
#include "defs.h"
#include "mem.h"
#include "kvp.h"
+#include "rights.h"
#include "trackdb.h"
#include "trackdb-int.h"
#include "trackdb.h"
#include "trackdb-int.h"
@@
-48,6
+49,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 }
};
@@
-60,6
+63,7
@@
static void help(void) {
" --version, -V Display version number\n"
" --config PATH, -c PATH Set configuration file\n"
" --debug, -d Turn on debugging\n"
" --version, -V Display version number\n"
" --config PATH, -c PATH Set configuration file\n"
" --debug, -d Turn on debugging\n"
+ " --[no-]syslog Force logging\n"
"\n"
"Deadlock manager for DisOrder. Not intended to be run\n"
"directly.\n");
"\n"
"Deadlock manager for DisOrder. Not intended to be run\n"
"directly.\n");
@@
-69,35
+73,35
@@
static void help(void) {
/* display version number and terminate */
static void version(void) {
/* display version number and terminate */
static void version(void) {
- xprintf("
disorder-deadlock version %s\n
", disorder_version_string);
+ xprintf("
%s
", disorder_version_string);
xfclose(stdout);
exit(0);
}
int main(int argc, char **argv) {
xfclose(stdout);
exit(0);
}
int main(int argc, char **argv) {
- int n, err, aborted;
+ int n, err, aborted
, logsyslog = !isatty(2)
;
set_progname(argv);
set_progname(argv);
- mem_init(0);
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
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();
case 'V': version();
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
case 'D': debugging = 0; break;
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");
}
}
default: fatal(0, "invalid option");
}
}
- /* if stderr is a TTY then log there, otherwise to syslog */
- if(!isatty(2)) {
+ if(logsyslog) {
openlog(progname, LOG_PID, LOG_DAEMON);
log_default = &log_syslog;
}
openlog(progname, LOG_PID, LOG_DAEMON);
log_default = &log_syslog;
}
- if(config_read()) fatal(0, "cannot read configuration");
+ if(config_read(
0
)) fatal(0, "cannot read configuration");
info("started");
info("started");
- trackdb_init(
0
);
+ trackdb_init(
TRACKDB_NO_RECOVER
);
while(getppid() != 1) {
if((err = trackdb_env->lock_detect(trackdb_env,
0,
while(getppid() != 1) {
if((err = trackdb_env->lock_detect(trackdb_env,
0,
@@
-121,4
+125,3
@@
fill-column:79
indent-tabs-mode:nil
End:
*/
indent-tabs-mode:nil
End:
*/
-/* arch-tag:8VzpRqqo2qifzXWK1GxF5A */