~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disobedience login window now only remembers password etc if they
[disorder]
/
server
/
deadlock.c
diff --git
a/server/deadlock.c
b/server/deadlock.c
index
aa29b41
..
1a47301
100644
(file)
--- a/
server/deadlock.c
+++ b/
server/deadlock.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder
/*
* This file is part of DisOrder
- * Copyright (C) 2005 Richard Kettlewell
+ * Copyright (C) 2005
, 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
@@
-18,29
+18,7
@@
* USA
*/
* USA
*/
-#include <config.h>
-#include "types.h"
-
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <db.h>
-#include <locale.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <pcre.h>
-#include <string.h>
-#include <syslog.h>
-
-#include "configuration.h"
-#include "syscalls.h"
-#include "log.h"
-#include "defs.h"
-#include "mem.h"
-#include "kvp.h"
-#include "trackdb.h"
-#include "trackdb-int.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' },
@@
-48,6
+26,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
+40,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");
@@
-67,37
+48,30
@@
static void help(void) {
exit(0);
}
exit(0);
}
-/* display version number and terminate */
-static void version(void) {
- xprintf("disorder-deadlock version %s\n", disorder_version_string);
- xfclose(stdout);
- exit(0);
-}
-
int main(int argc, char **argv) {
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();
switch(n) {
case 'h': help();
- case 'V': version();
+ case 'V': version(
"disorder-deadlock"
);
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 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
+95,3
@@
fill-column:79
indent-tabs-mode:nil
End:
*/
indent-tabs-mode:nil
End:
*/
-/* arch-tag:8VzpRqqo2qifzXWK1GxF5A */