chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: never delay logging if the log server is stuck, always drop messages quickly
[elogind.git]
/
src
/
log.c
diff --git
a/src/log.c
b/src/log.c
index 1a6ea7e5a84fbb2b97303f2b2775ce4e62bfde80..0594f7fde59cc208cc5940e31386f598d17d0545 100644
(file)
--- a/
src/log.c
+++ b/
src/log.c
@@
-33,8
+33,6
@@
#include "macro.h"
#include "socket-util.h"
#include "macro.h"
#include "socket-util.h"
-#define SOCKET_TIMEOUT_USEC (5*USEC_PER_SEC)
-
static LogTarget log_target = LOG_TARGET_CONSOLE;
static int log_max_level = LOG_INFO;
static LogTarget log_target = LOG_TARGET_CONSOLE;
static int log_max_level = LOG_INFO;
@@
-120,25
+118,15
@@
void log_close_syslog(void) {
}
static int create_log_socket(int type) {
}
static int create_log_socket(int type) {
- struct timeval tv;
int fd;
int fd;
- if (getpid() == 1)
- /* systemd should not block on syslog */
- type |= SOCK_NONBLOCK;
+ /* All output to the syslog/journal fds we do asynchronously,
+ * and if the buffers are full we just drop the messages */
- fd = socket(AF_UNIX, type|SOCK_CLOEXEC, 0);
+ fd = socket(AF_UNIX, type|SOCK_CLOEXEC
|SOCK_NONBLOCK
, 0);
if (fd < 0)
return -errno;
if (fd < 0)
return -errno;
- /* Make sure we don't block for more than 5s when talking to
- * syslog */
- timeval_store(&tv, SOCKET_TIMEOUT_USEC);
- if (setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)) < 0) {
- close_nointr_nofail(fd);
- return -errno;
- }
-
return fd;
}
return fd;
}