chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logger: support printk() style priority prefixes
[elogind.git]
/
logger.c
diff --git
a/logger.c
b/logger.c
index b7c8ab850754cbd06fda6cd48c08a9d131c0f32c..f81d2c5c8a627c7d3d9d10ade247869c6524cb92 100644
(file)
--- a/
logger.c
+++ b/
logger.c
@@
-55,10
+55,16
@@
typedef struct Server {
unsigned n_streams;
} Server;
unsigned n_streams;
} Server;
+typedef enum StreamTarget {
+ STREAM_SYSLOG,
+ STREAM_KMSG
+} StreamTarget;
+
typedef enum StreamState {
typedef enum StreamState {
- STREAM_
LOG_
TARGET,
+ STREAM_TARGET,
STREAM_PRIORITY,
STREAM_PROCESS,
STREAM_PRIORITY,
STREAM_PROCESS,
+ STREAM_PREFIX,
STREAM_RUNNING
} StreamState;
STREAM_RUNNING
} StreamState;
@@
-75,6
+81,8
@@
struct Stream {
pid_t pid;
uid_t uid;
pid_t pid;
uid_t uid;
+ bool prefix;
+
char buffer[STREAM_BUFFER];
size_t length;
char buffer[STREAM_BUFFER];
size_t length;
@@
-85,10
+93,24
@@
static int stream_log(Stream *s, char *p, usec_t timestamp) {
char header_priority[16], header_time[64], header_pid[16];
struct iovec iovec[5];
char header_priority[16], header_time[64], header_pid[16];
struct iovec iovec[5];
+ int priority;
assert(s);
assert(p);
assert(s);
assert(p);
+ priority = s->priority;
+
+ if (s->prefix &&
+ p[0] == '<' &&
+ p[1] >= '0' && p[1] <= '7' &&
+ p[2] == '>') {
+
+ /* Detected priority prefix */
+ priority = LOG_MAKEPRI(LOG_FAC(priority), (p[1] - '0'));
+
+ p += 3;
+ }
+
if (*p == 0)
return 0;
if (*p == 0)
return 0;
@@
-105,10
+127,10
@@
static int stream_log(Stream *s, char *p, usec_t timestamp) {
*/
snprintf(header_priority, sizeof(header_priority), "<%i>",
*/
snprintf(header_priority, sizeof(header_priority), "<%i>",
- s->target ==
LOG_TARGET_SYSLOG ? s->priority : LOG_PRI(s->
priority));
+ s->target ==
STREAM_SYSLOG ? priority : LOG_PRI(
priority));
char_array_0(header_priority);
char_array_0(header_priority);
- if (s->target ==
LOG_TARGET
_SYSLOG) {
+ if (s->target ==
STREAM
_SYSLOG) {
time_t t;
struct tm *tm;
time_t t;
struct tm *tm;
@@
-126,7
+148,7
@@
static int stream_log(Stream *s, char *p, usec_t timestamp) {
zero(iovec);
IOVEC_SET_STRING(iovec[0], header_priority);
zero(iovec);
IOVEC_SET_STRING(iovec[0], header_priority);
- if (s->target ==
LOG_TARGET
_SYSLOG) {
+ if (s->target ==
STREAM
_SYSLOG) {
struct msghdr msghdr;
IOVEC_SET_STRING(iovec[1], header_time);
struct msghdr msghdr;
IOVEC_SET_STRING(iovec[1], header_time);
@@
-141,7
+163,7
@@
static int stream_log(Stream *s, char *p, usec_t timestamp) {
if (sendmsg(s->server->syslog_fd, &msghdr, MSG_NOSIGNAL) < 0)
return -errno;
if (sendmsg(s->server->syslog_fd, &msghdr, MSG_NOSIGNAL) < 0)
return -errno;
- } else if (s->target ==
LOG_TARGET
_KMSG) {
+ } else if (s->target ==
STREAM
_KMSG) {
IOVEC_SET_STRING(iovec[1], s->process);
IOVEC_SET_STRING(iovec[2], header_pid);
IOVEC_SET_STRING(iovec[3], p);
IOVEC_SET_STRING(iovec[1], s->process);
IOVEC_SET_STRING(iovec[2], header_pid);
IOVEC_SET_STRING(iovec[3], p);
@@
-165,13
+187,13
@@
static int stream_line(Stream *s, char *p, usec_t timestamp) {
switch (s->state) {
switch (s->state) {
- case STREAM_
LOG_
TARGET:
+ case STREAM_TARGET:
if (streq(p, "syslog"))
if (streq(p, "syslog"))
- s->target =
LOG_TARGET
_SYSLOG;
+ s->target =
STREAM
_SYSLOG;
else if (streq(p, "kmsg")) {
if (s->server->kmsg_fd >= 0 && s->uid == 0)
else if (streq(p, "kmsg")) {
if (s->server->kmsg_fd >= 0 && s->uid == 0)
- s->target =
LOG_TARGET
_KMSG;
+ s->target =
STREAM
_KMSG;
else {
log_warning("/dev/kmsg logging not available.");
return -EPERM;
else {
log_warning("/dev/kmsg logging not available.");
return -EPERM;
@@
-201,6
+223,15
@@
static int stream_line(Stream *s, char *p, usec_t timestamp) {
if (!(s->process = strdup(p)))
return -ENOMEM;
if (!(s->process = strdup(p)))
return -ENOMEM;
+ s->state = STREAM_PREFIX;
+ return 0;
+
+ case STREAM_PREFIX:
+
+ if ((r = parse_boolean(p)) < 0)
+ return r;
+
+ s->prefix = r;
s->state = STREAM_RUNNING;
return 0;
s->state = STREAM_RUNNING;
return 0;