From f6c2e28b07a0d24c68f7780fc986ac3619fdcbdb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 10 Aug 2012 19:35:43 +0200 Subject: [PATCH] directive-index: journal directives --- Makefile.am | 3 +- make-directive-index.py | 10 +++++ man/systemd.journal-fields.xml | 68 +++++++++++++++++----------------- 3 files changed, 46 insertions(+), 35 deletions(-) diff --git a/Makefile.am b/Makefile.am index 32f08edb0..8f421001c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -704,7 +704,8 @@ XML_DIRECTIVE_FILES = \ man/systemd.exec.xml \ man/systemd.kill.xml \ man/systemd.device.xml \ - man/systemd.conf.xml + man/systemd.conf.xml \ + man/systemd.journal-fields.xml man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES) $(AM_V_at)$(MKDIR_P) $(dir $@) diff --git a/make-directive-index.py b/make-directive-index.py index 468ea583f..af2d948cd 100644 --- a/make-directive-index.py +++ b/make-directive-index.py @@ -56,6 +56,15 @@ TEMPLATE = '''\ + + + Journal directives + + Directives for configuring the behaviour of the + journald process. + + + ''' @@ -111,6 +120,7 @@ def make_page(xml_files): for name in ['unit-directives', 'udev-directives', 'systemd-directives', + 'journal-directives', ]} for page in xml_files: _extract_directives(directive_groups, page) diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index b555c0e0a..d1cb40bb1 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -68,9 +68,9 @@ User fields are fields that are directly passed from clients and stored in the journal. - + - MESSAGE= + MESSAGE= The human readable message string for this @@ -85,7 +85,7 @@ - MESSAGE_ID= + MESSAGE_ID= A 128bit message identifier ID for recognizing @@ -107,7 +107,7 @@ - PRIORITY= + PRIORITY= A priority value between 0 (emerg) @@ -121,9 +121,9 @@ - CODE_FILE= - CODE_LINE= - CODE_FUNC= + CODE_FILE= + CODE_LINE= + CODE_FUNC= The code location generating this message, if @@ -134,7 +134,7 @@ - ERRNO= + ERRNO= The low-level Unix error number causing this entry, if @@ -147,9 +147,9 @@ - SYSLOG_FACILITY= - SYSLOG_IDENTIFIER= - SYSLOG_PID= + SYSLOG_FACILITY= + SYSLOG_IDENTIFIER= + SYSLOG_PID= Syslog compatibility fields containing the facility @@ -170,11 +170,11 @@ fields, i.e. fields that are implicitly added by the journal and cannot be altered by client code. - + - _PID= - _UID= - _GID= + _PID= + _UID= + _GID= The process, user and group ID of the process the @@ -185,9 +185,9 @@ - _COMM= - _EXE= - _CMDLINE= + _COMM= + _EXE= + _CMDLINE= The name, the executable path and the command line of @@ -197,8 +197,8 @@ - _AUDIT_SESSION= - _AUDIT_LOGINUID= + _AUDIT_SESSION= + _AUDIT_LOGINUID= The session and login UID of the process the journal @@ -209,10 +209,10 @@ - _SYSTEMD_CGROUP= - _SYSTEMD_SESSION= - _SYSTEMD_UNIT= - _SYSTEMD_OWNER_UID= + _SYSTEMD_CGROUP= + _SYSTEMD_SESSION= + _SYSTEMD_UNIT= + _SYSTEMD_OWNER_UID= The contol group path in @@ -227,7 +227,7 @@ - _SELINUX_CONTEXT= + _SELINUX_CONTEXT= The SELinux security context of the process the @@ -237,7 +237,7 @@ - _SOURCE_REALTIME_TIMESTAMP= + _SOURCE_REALTIME_TIMESTAMP= The earliest trusted timestamp of the message, if @@ -251,7 +251,7 @@ - _BOOT_ID= + _BOOT_ID= The kernel boot ID for the boot the message was @@ -262,7 +262,7 @@ - _MACHINE_ID= + _MACHINE_ID= The machine ID of the originating host, as available @@ -272,7 +272,7 @@ - _HOSTNAME= + _HOSTNAME= The name of the originating host. @@ -280,7 +280,7 @@ - _TRANSPORT= + _TRANSPORT= How the entry was received by the journal @@ -383,9 +383,9 @@ may also not be used as matches for sd_journal_add_match3 - + - __CURSOR= + __CURSOR= The cursor for the entry. A cursor is an opaque @@ -399,7 +399,7 @@ - __REALTIME_TIMESTAMP= + __REALTIME_TIMESTAMP= The wallclock time (CLOCK_REALTIME) at the point @@ -416,7 +416,7 @@ - __MONOTONIC_TIMESTAMP= + __MONOTONIC_TIMESTAMP= The monotonic time (CLOCK_MONOTONIC) at the point -- 2.30.2