External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 15:15:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send virLogMetadata fields onto the journal

Browse Source 
The systemd journal accepts arbitrary user specified log
fields. These can be passed into virLogMessage via the
virLogMetadata structure. Allow up to 5 custom fields to
be reported by libvirt callers.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2014-02-21 17:21:55 +00:00
parent 97962616c1
commit 54209df345
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/util/virlog.c
View File

@ -1153,7 +1153,7 @@ virLogOutputToJournald(virLogSource source,
int linenr, int linenr,
const char *funcname, const char *funcname,
const char *timestamp ATTRIBUTE_UNUSED, const char *timestamp ATTRIBUTE_UNUSED,
virLogMetadataPtr metadata ATTRIBUTE_UNUSED, virLogMetadataPtr metadata,
unsigned int flags, unsigned int flags,
const char *rawstr, const char *rawstr,
const char *str ATTRIBUTE_UNUSED, const char *str ATTRIBUTE_UNUSED,
@ -1172,8 +1172,11 @@ virLogOutputToJournald(virLogSource source,
* be a tmpfs, and one that is available from early boot on * be a tmpfs, and one that is available from early boot on
* and where unprivileged users can create files. */ * and where unprivileged users can create files. */
char path[] = "/dev/shm/journal.XXXXXX"; char path[] = "/dev/shm/journal.XXXXXX";
size_t nmetadata = 0;
# define NUM_FIELDS 6 # define NUM_FIELDS_CORE 6
# define NUM_FIELDS_META 5
# define NUM_FIELDS (NUM_FIELDS_CORE + NUM_FIELDS_META)
struct iovec iov[NUM_FIELDS * 5]; struct iovec iov[NUM_FIELDS * 5];
char iov_bufs[NUM_FIELDS][JOURNAL_BUF_SIZE]; char iov_bufs[NUM_FIELDS][JOURNAL_BUF_SIZE];
struct journalState state; struct journalState state;
@ -1192,6 +1195,17 @@ virLogOutputToJournald(virLogSource source,
journalAddInt(&state, "CODE_LINE", linenr); journalAddInt(&state, "CODE_LINE", linenr);
if (funcname) if (funcname)
journalAddString(&state, "CODE_FUNC", funcname); journalAddString(&state, "CODE_FUNC", funcname);
if (metadata != NULL) {
while (metadata->key != NULL &&
nmetadata < NUM_FIELDS_META) {
if (metadata->s != NULL)
journalAddString(&state, metadata->key, metadata->s);
else
journalAddInt(&state, metadata->key, metadata->iv);
metadata++;
nmetadata++;
}
}
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sa.sun_family = AF_UNIX; sa.sun_family = AF_UNIX;