summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-04-14 02:32:42 +0200
committerLennart Poettering <lennart@poettering.net>2011-04-16 02:03:34 +0200
commitef9eb0a8976140654827d479af1f4256fae6afe3 (patch)
tree58bd61dac18d174264c6366ed5ad533a099efc20
parent7f434cf4c9a72c3291a8603a3e91dd66dde4d640 (diff)
downloadsystemd-ef9eb0a8976140654827d479af1f4256fae6afe3.tar.gz
logger,initctl: use global exit timeout
-rw-r--r--src/def.h2
-rw-r--r--src/initctl.c5
-rw-r--r--src/logger.c5
3 files changed, 8 insertions, 4 deletions
diff --git a/src/def.h b/src/def.h
index c23cd33d8a..958d1eb79c 100644
--- a/src/def.h
+++ b/src/def.h
@@ -27,6 +27,8 @@
#define DEFAULT_TIMEOUT_USEC (3*USEC_PER_MINUTE)
#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
+#define DEFAULT_EXIT_USEC (5*USEC_PER_MINUTE)
+
#define SYSTEMD_CGROUP_CONTROLLER "name=systemd"
#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
diff --git a/src/initctl.c b/src/initctl.c
index 15da4593d0..dd743142fd 100644
--- a/src/initctl.c
+++ b/src/initctl.c
@@ -42,9 +42,10 @@
#include "special.h"
#include "sd-daemon.h"
#include "dbus-common.h"
+#include "def.h"
#define SERVER_FD_MAX 16
-#define TIMEOUT ((int) (10*MSEC_PER_SEC))
+#define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC))
typedef struct Fifo Fifo;
@@ -388,7 +389,7 @@ int main(int argc, char *argv[]) {
if ((k = epoll_wait(server.epoll_fd,
&event, 1,
- TIMEOUT)) < 0) {
+ TIMEOUT_MSEC)) < 0) {
if (errno == EINTR)
continue;
diff --git a/src/logger.c b/src/logger.c
index faa6c9721f..81196dbe00 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -37,10 +37,11 @@
#include "list.h"
#include "sd-daemon.h"
#include "tcpwrap.h"
+#include "def.h"
#define STREAMS_MAX 4096
#define SERVER_FD_MAX 16
-#define TIMEOUT ((int) (5*60*MSEC_PER_SEC))
+#define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC))
typedef struct Stream Stream;
@@ -661,7 +662,7 @@ int main(int argc, char *argv[]) {
if ((k = epoll_wait(server.epoll_fd,
&event, 1,
- server.n_streams <= 0 ? TIMEOUT : -1)) < 0) {
+ server.n_streams <= 0 ? TIMEOUT_MSEC : -1)) < 0) {
if (errno == EINTR)
continue;