mirror of
https://github.com/rsyslog/rsyslog.git
synced 2025-12-20 06:10:42 +01:00
Merge branch 'v5-stable' into v6-stable
This commit is contained in:
Rainer Gerhards
commit
908586ce95
@ -174,5 +174,5 @@ lmnsd_gtls_la_LIBADD = $(GNUTLS_LIBS)
|
||||
endif
|
||||
|
||||
update-systemd:
|
||||
curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
|
||||
curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h
|
||||
curl http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c > sd-daemon.c
|
||||
curl http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h > sd-daemon.h
|
||||
|
||||
@ -58,25 +58,21 @@ extern "C" {
|
||||
|
||||
You may find an up-to-date version of these source files online:
|
||||
|
||||
http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h
|
||||
http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c
|
||||
http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h
|
||||
http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c
|
||||
|
||||
This should compile on non-Linux systems, too, but with the
|
||||
exception of the sd_is_xxx() calls all functions will become NOPs.
|
||||
|
||||
See sd-daemon(7) for more information.
|
||||
See sd-daemon(3) for more information.
|
||||
*/
|
||||
|
||||
#if (__GNUC__ >= 4)
|
||||
#ifndef _sd_printf_attr_
|
||||
#if __GNUC__ >= 4
|
||||
#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
|
||||
# if defined(SD_EXPORT_SYMBOLS)
|
||||
# define _sd_hidden_
|
||||
# else
|
||||
# define _sd_hidden_ __attribute__ ((visibility("hidden")))
|
||||
# endif
|
||||
#else
|
||||
#define _sd_printf_attr_(a,b)
|
||||
#define _sd_hidden_
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -113,7 +109,7 @@ extern "C" {
|
||||
|
||||
See sd_listen_fds(3) for more information.
|
||||
*/
|
||||
int sd_listen_fds(int unset_environment) _sd_hidden_;
|
||||
int sd_listen_fds(int unset_environment);
|
||||
|
||||
/*
|
||||
Helper call for identifying a passed file descriptor. Returns 1 if
|
||||
@ -125,7 +121,19 @@ int sd_listen_fds(int unset_environment) _sd_hidden_;
|
||||
|
||||
See sd_is_fifo(3) for more information.
|
||||
*/
|
||||
int sd_is_fifo(int fd, const char *path) _sd_hidden_;
|
||||
int sd_is_fifo(int fd, const char *path);
|
||||
|
||||
/*
|
||||
Helper call for identifying a passed file descriptor. Returns 1 if
|
||||
the file descriptor is a special character device on the file
|
||||
system stored under the specified path, 0 otherwise.
|
||||
If path is NULL a path name check will not be done and the call
|
||||
only verifies if the file descriptor refers to a special character.
|
||||
Returns a negative errno style error code on failure.
|
||||
|
||||
See sd_is_special(3) for more information.
|
||||
*/
|
||||
int sd_is_special(int fd, const char *path);
|
||||
|
||||
/*
|
||||
Helper call for identifying a passed file descriptor. Returns 1 if
|
||||
@ -141,7 +149,7 @@ int sd_is_fifo(int fd, const char *path) _sd_hidden_;
|
||||
|
||||
See sd_is_socket(3) for more information.
|
||||
*/
|
||||
int sd_is_socket(int fd, int family, int type, int listening) _sd_hidden_;
|
||||
int sd_is_socket(int fd, int family, int type, int listening);
|
||||
|
||||
/*
|
||||
Helper call for identifying a passed file descriptor. Returns 1 if
|
||||
@ -155,7 +163,7 @@ int sd_is_socket(int fd, int family, int type, int listening) _sd_hidden_;
|
||||
|
||||
See sd_is_socket_inet(3) for more information.
|
||||
*/
|
||||
int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) _sd_hidden_;
|
||||
int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port);
|
||||
|
||||
/*
|
||||
Helper call for identifying a passed file descriptor. Returns 1 if
|
||||
@ -171,7 +179,15 @@ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port
|
||||
|
||||
See sd_is_socket_unix(3) for more information.
|
||||
*/
|
||||
int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) _sd_hidden_;
|
||||
int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length);
|
||||
|
||||
/*
|
||||
Helper call for identifying a passed file descriptor. Returns 1 if
|
||||
the file descriptor is a POSIX Message Queue of the specified name,
|
||||
0 otherwise. If path is NULL a message queue name check is not
|
||||
done. Returns a negative errno style error code on failure.
|
||||
*/
|
||||
int sd_is_mq(int fd, const char *path);
|
||||
|
||||
/*
|
||||
Informs systemd about changed daemon state. This takes a number of
|
||||
@ -181,7 +197,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
|
||||
READY=1 Tells systemd that daemon startup is finished (only
|
||||
relevant for services of Type=notify). The passed
|
||||
argument is a boolean "1" or "0". Since there is
|
||||
little value in signalling non-readiness the only
|
||||
little value in signaling non-readiness the only
|
||||
value daemons should send is "READY=1".
|
||||
|
||||
STATUS=... Passes a single-line status string back to systemd
|
||||
@ -201,8 +217,13 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
|
||||
MAINPID=... The main pid of a daemon, in case systemd did not
|
||||
fork off the process itself. Example: "MAINPID=4711"
|
||||
|
||||
WATCHDOG=1 Tells systemd to update the watchdog timestamp.
|
||||
Services using this feature should do this in
|
||||
regular intervals. A watchdog framework can use the
|
||||
timestamps to detect failed services.
|
||||
|
||||
Daemons can choose to send additional variables. However, it is
|
||||
recommened to prefix variable names not listed above with X_.
|
||||
recommended to prefix variable names not listed above with X_.
|
||||
|
||||
Returns a negative errno-style error code on failure. Returns > 0
|
||||
if systemd could be notified, 0 if it couldn't possibly because
|
||||
@ -217,7 +238,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
|
||||
|
||||
See sd_notify(3) for more information.
|
||||
*/
|
||||
int sd_notify(int unset_environment, const char *state) _sd_hidden_;
|
||||
int sd_notify(int unset_environment, const char *state);
|
||||
|
||||
/*
|
||||
Similar to sd_notify() but takes a format string.
|
||||
@ -239,7 +260,7 @@ int sd_notify(int unset_environment, const char *state) _sd_hidden_;
|
||||
|
||||
See sd_notifyf(3) for more information.
|
||||
*/
|
||||
int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3) _sd_hidden_;
|
||||
int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3);
|
||||
|
||||
/*
|
||||
Returns > 0 if the system was booted with systemd. Returns < 0 on
|
||||
@ -248,11 +269,11 @@ int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(
|
||||
fine. You should NOT protect them with a call to this function. Also
|
||||
note that this function checks whether the system, not the user
|
||||
session is controlled by systemd. However the functions above work
|
||||
for both session and system services.
|
||||
for both user and system services.
|
||||
|
||||
See sd_booted(3) for more information.
|
||||
*/
|
||||
int sd_booted(void) _sd_hidden_;
|
||||
int sd_booted(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user