diff options
author | Ben Pfaff <blp@nicira.com> | 2012-01-27 09:53:17 -0800 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2012-02-02 16:26:53 -0800 |
commit | 7d0c5973d5165f3cc6099de326ad0dfc326bac33 (patch) | |
tree | 9a3b999be106928f49d24201288174f6b3b15987 /lib/daemon.c | |
parent | 8f46c9bb842d2564297939aef369b4e4baaaaa43 (diff) |
daemon: New function daemon_save_fd() to preserve fds across detach.
This eliminates a kluge that was duplicated in three different daemons.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/daemon.c')
-rw-r--r-- | lib/daemon.c | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/lib/daemon.c b/lib/daemon.c index 3dd5a1ab..8ef5491a 100644 --- a/lib/daemon.c +++ b/lib/daemon.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ #include <config.h> #include "daemon.h" +#include <assert.h> #include <errno.h> #include <fcntl.h> #include <signal.h> @@ -61,6 +62,10 @@ static int daemonize_fd = -1; * it dies due to an error signal? */ static bool monitor; +/* For each of the standard file descriptors, whether to replace it by + * /dev/null (if false) or keep it for the daemon to use (if true). */ +static bool save_fds[3]; + static void check_already_running(void); static int lock_pidfile(FILE *, int command); @@ -142,6 +147,20 @@ daemon_set_monitor(void) monitor = true; } +/* A daemon doesn't normally have any use for the file descriptors for stdin, + * stdout, and stderr after it detaches. To keep these file descriptors from + * e.g. holding an SSH session open, by default detaching replaces each of + * these file descriptors by /dev/null. But a few daemons expect the user to + * redirect stdout or stderr to a file, in which case it is desirable to keep + * these file descriptors. This function, therefore, disables replacing 'fd' + * by /dev/null when the daemon detaches. */ +void +daemon_save_fd(int fd) +{ + assert(fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO); + save_fds[fd] = true; +} + /* If a pidfile has been configured, creates it and stores the running * process's pid in it. Ensures that the pidfile will be deleted when the * process exits. */ @@ -402,16 +421,21 @@ monitor_daemon(pid_t daemon_pid) program_name = saved_program_name; } -/* Close stdin, stdout, stderr. If we're started from e.g. an SSH session, - * then this keeps us from holding that session open artificially. */ +/* Close standard file descriptors (except any that the client has requested we + * leave open by calling daemon_save_fd()). If we're started from e.g. an SSH + * session, then this keeps us from holding that session open artificially. */ static void close_standard_fds(void) { int null_fd = get_null_fd(); if (null_fd >= 0) { - dup2(null_fd, STDIN_FILENO); - dup2(null_fd, STDOUT_FILENO); - dup2(null_fd, STDERR_FILENO); + int fd; + + for (fd = 0; fd < 3; fd++) { + if (!save_fds[fd]) { + dup2(null_fd, fd); + } + } } /* Disable logging to stderr to avoid wasting CPU time. */ |