shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

journal: introduce mandatory sd_journal_printf() priority parameter

Browse Source
This commit is contained in:
Lennart Poettering 2011-12-17 01:32:49 +01:00
parent cab8ac6083
commit d0bbc21caa
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/journal/journal-send.c
View File

@ -52,30 +52,33 @@ retry:
return fd; return fd;
} }
int sd_journal_print(const char *format, ...) { int sd_journal_print(int priority, const char *format, ...) {
int r; int r;
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
r = sd_journal_printv(format, ap); r = sd_journal_printv(priority, format, ap);
va_end(ap); va_end(ap);
return r; return r;
} }
int sd_journal_printv(const char *format, va_list ap) { int sd_journal_printv(int priority, const char *format, va_list ap) {
char buffer[8 + LINE_MAX]; char buffer[8 + LINE_MAX], p[11];
struct iovec iov; struct iovec iov[2];
snprintf(p, sizeof(p), "PRIORITY=%i", priority & LOG_PRIMASK);
char_array_0(p);
memcpy(buffer, "MESSAGE=", 8); memcpy(buffer, "MESSAGE=", 8);
vsnprintf(buffer+8, sizeof(buffer) - 8, format, ap); vsnprintf(buffer+8, sizeof(buffer) - 8, format, ap);
char_array_0(buffer); char_array_0(buffer);
zero(iov); zero(iov);
IOVEC_SET_STRING(iov, buffer); IOVEC_SET_STRING(iov[0], buffer);
IOVEC_SET_STRING(iov[1], p);
return sd_journal_sendv(&iov, 1); return sd_journal_sendv(iov, 2);
} }
int sd_journal_send(const char *format, ...) { int sd_journal_send(const char *format, ...) {

4
src/journal/sd-journal.h
View File

@ -45,8 +45,8 @@
/* Write to daemon */ /* Write to daemon */
int sd_journal_print(const char *format, ...) __attribute__ ((format (printf, 1, 2))); int sd_journal_print(int piority, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
int sd_journal_printv(const char *format, va_list ap); int sd_journal_printv(int priority, const char *format, va_list ap);
int sd_journal_send(const char *format, ...) __attribute__((sentinel)); int sd_journal_send(const char *format, ...) __attribute__((sentinel));
int sd_journal_sendv(const struct iovec *iov, int n); int sd_journal_sendv(const struct iovec *iov, int n);