X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournald-server.h;h=42a2235ba91573d5c43d131cb48ba942609b0858;hp=2c3e2c239dc13c5009a20bf869c8d3b4dd62607a;hb=cf677ac1b7ae1e46c593d055df27f36528be548a;hpb=f9a810bedacf1da7c505c1786a2416d592665926 diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h index 2c3e2c239..42a2235ba 100644 --- a/src/journal/journald-server.h +++ b/src/journal/journald-server.h @@ -45,8 +45,8 @@ typedef enum Storage { } Storage; typedef enum SplitMode { - SPLIT_LOGIN, SPLIT_UID, + SPLIT_LOGIN, SPLIT_NONE, _SPLIT_MAX, _SPLIT_INVALID = -1 @@ -59,6 +59,7 @@ typedef struct Server { int native_fd; int stdout_fd; int dev_kmsg_fd; + int hostname_fd; sd_event *event; @@ -71,6 +72,7 @@ typedef struct Server { sd_event_source *sigusr2_event_source; sd_event_source *sigterm_event_source; sd_event_source *sigint_event_source; + sd_event_source *hostname_event_source; JournalFile *runtime_journal; JournalFile *system_journal; @@ -95,6 +97,7 @@ typedef struct Server { bool forward_to_kmsg; bool forward_to_syslog; bool forward_to_console; + bool forward_to_wall; unsigned n_forward_syslog_missed; usec_t last_warn_forward_syslog_missed; @@ -117,6 +120,7 @@ typedef struct Server { int max_level_syslog; int max_level_kmsg; int max_level_console; + int max_level_wall; Storage storage; SplitMode split_mode; @@ -130,6 +134,13 @@ typedef struct Server { struct udev *udev; bool sync_scheduled; + + char machine_id_field[sizeof("_MACHINE_ID=") + 32]; + char boot_id_field[sizeof("_BOOT_ID=") + 32]; + char *hostname_field; + + /* Cached cgroup root, so that we don't have to query that all the time */ + char *cgroup_root; } Server; #define N_IOVEC_META_FIELDS 20