chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: if we are already in our own cgroup, then reuse it
[elogind.git]
/
log.c
diff --git
a/log.c
b/log.c
index ffca41c2702e45c4e4fe6ddd0561011d8af48bed..b82018f28b509c15091642665aad038879ea1f05 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-58,8
+58,12
@@
int log_open_kmsg(void) {
if (kmsg_fd >= 0)
return 0;
if (kmsg_fd >= 0)
return 0;
- if ((kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0)
+ if ((kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0) {
+ log_info("Failed to open syslog for logging: %s", strerror(errno));
return -errno;
return -errno;
+ }
+
+ log_info("Succesfully opened /dev/kmsg for logging.");
return 0;
}
return 0;
}
@@
-107,9
+111,13
@@
int log_open_syslog(void) {
if (connect(syslog_fd, &sa.sa, sizeof(sa)) < 0) {
r = -errno;
log_close_syslog();
if (connect(syslog_fd, &sa.sa, sizeof(sa)) < 0) {
r = -errno;
log_close_syslog();
- return -errno;
+
+ log_info("Failed to open syslog for logging: %s", strerror(-r));
+ return r;
}
}
+ log_info("Succesfully opened syslog for logging.");
+
return 0;
}
return 0;
}
@@
-305,6
+313,14
@@
void log_parse_environment(void) {
log_warning("Failed to parse log level %s. Ignoring.", e);
}
log_warning("Failed to parse log level %s. Ignoring.", e);
}
+LogTarget log_get_target(void) {
+ return log_target;
+}
+
+int log_get_max_level(void) {
+ return log_max_level;
+}
+
static const char *const log_target_table[] = {
[LOG_TARGET_CONSOLE] = "console",
[LOG_TARGET_SYSLOG] = "syslog",
static const char *const log_target_table[] = {
[LOG_TARGET_CONSOLE] = "console",
[LOG_TARGET_SYSLOG] = "syslog",