diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-10-16 00:05:23 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-10-16 01:16:12 +0300 |
commit | a0631c9ac2c13c3ef1db027a490620504a287d3f (patch) | |
tree | 5cc3c9d5b588974eee29d17c724dbdd8551dfdc8 /doc | |
parent | 9670b8cada0df307c6ffd9be1b14f5dfd51cc958 (diff) | |
download | pies-a0631c9ac2c13c3ef1db027a490620504a287d3f.tar.gz pies-a0631c9ac2c13c3ef1db027a490620504a287d3f.tar.bz2 |
Various improvements.
* configure.ac (AC_CHECK_FUNCS): Check for vsyslog.
* src/diag.c (syslog_printer) [!HAVE_VSYSLOG]: call syslog.
* src/pies.c (component_keywords): Remove settle-timeout,
replace it with pass-fd-timeout.
(main): Force syslog logging if !foreground.
Do not close first three fds before restarting
if log_to_stderr is set.
* src/pies.h (DEFAULT_PASS_FD_TIMEOUT): New constant.
(struct component): Replace settle_timeout with
pass_fd_timeout. All uses changed.
(pass_fd): Pass timeout as argument.
* src/progman.c (prog_start): Remove hardcoded sleep before
calling pass_fd. Update call to pass_fd.
(prog_start_prerequisites): Remove handling of settle_timeout.
* src/socket.c (open_unix_socket): Remove.
(pass_fd): Rewrite.
* doc/pies.texi: Update.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/pies.texi | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/doc/pies.texi b/doc/pies.texi index f1654c0..93a329e 100644 --- a/doc/pies.texi +++ b/doc/pies.texi @@ -750,17 +750,16 @@ Remove @var{file-name}. This is useful, for example, to remove stale @acronym{UNIX} sockets or pid-files, which may otherwise prevent the component from starting normally. As of version @value{VERSION} only one @command{remove-file} may be given. @end deffn -@deffn {Config: component} settle-timeout @var{number} -Wait @var{number} of seconds. This is kind of kludge. Currently it is -used for components imported from @file{meta1.conf} file -(@pxref{include-meta1}), where @code{settle-timeout 1} is implied. -This may change in future versions. +@deffn {Config: component} pass-fd-timeout @var{number} +Wait @var{number} of seconds for the @samp{pass-fd} socket +to become available (@pxref{Meta1-Style Components}). Default is +5 seconds. @end deffn @node Exit Actions @subsection Exit Actions @kwindex return-code The default behavior of @command{pies} if an @samp{init-style} @@ -1070,15 +1069,15 @@ component @var{tag} @{ # @r{Change to this directory before executing the component.} # @xref{Actions Before Startup, chdir}. chdir @var{dir}; # @r{Remove @var{file-name} before starting the component.} # @xref{Actions Before Startup, remove-file}. remove-file @var{file-name}; - # @r{Time to wait before starting this component.} - # @xref{Actions Before Startup, settle-timeout}. - settle-timeout @var{number}; + # @r{Wait @var{number} of seconds for pass-fd socket to become available.} + # @xref{Actions Before Startup, pass-fd-timeout}. + pass-fd-timeout @var{number}; # @r{Actions:} # @xref{Exit Actions}. return-code @var{exit-code-list} @{ # @r{Action to take when a component finishes with this return code.} action @samp{disable | restart}; |