X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournald.h;h=da2c31247474872e0a97479b297ecf668548f81c;hp=47feca40aaf2743d9601e7ce316fdbabaa69c14f;hb=bdfb9e7f7c315af5a6755ac4701b696ce2305a19;hpb=e6960940b6dc5ab81eb2fca4061c333e1795f38d diff --git a/src/journal/journald.h b/src/journal/journald.h index 47feca40a..da2c31247 100644 --- a/src/journal/journald.h +++ b/src/journal/journald.h @@ -1,7 +1,6 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#ifndef foojournaldhfoo -#define foojournaldhfoo +#pragma once /*** This file is part of systemd. @@ -9,16 +8,16 @@ Copyright 2011 Lennart Poettering systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. systemd is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . ***/ @@ -29,9 +28,19 @@ #include "journal-file.h" #include "hashmap.h" #include "util.h" +#include "audit.h" #include "journal-rate-limit.h" #include "list.h" +typedef enum Storage { + STORAGE_AUTO, + STORAGE_VOLATILE, + STORAGE_PERSISTENT, + STORAGE_NONE, + _STORAGE_MAX, + _STORAGE_INVALID = -1 +} Storage; + typedef struct StdoutStream StdoutStream; typedef struct Server { @@ -40,6 +49,7 @@ typedef struct Server { int syslog_fd; int native_fd; int stdout_fd; + int dev_kmsg_fd; JournalFile *runtime_journal; JournalFile *system_journal; @@ -58,17 +68,45 @@ typedef struct Server { JournalMetrics system_metrics; bool compress; + bool seal; + + bool forward_to_kmsg; + bool forward_to_syslog; + bool forward_to_console; uint64_t cached_available_space; usec_t cached_available_space_timestamp; uint64_t var_available_timestamp; + gid_t file_gid; + bool file_gid_valid; + LIST_HEAD(StdoutStream, stdout_streams); unsigned n_stdout_streams; + + char *tty_path; + + int max_level_store; + int max_level_syslog; + int max_level_kmsg; + int max_level_console; + + Storage storage; + + MMapCache *mmap; + + bool dev_kmsg_readable; + + uint64_t *kernel_seqnum; + + struct udev *udev; } Server; /* gperf lookup function */ const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length); -#endif +int config_parse_storage(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); + +const char *storage_to_string(Storage s); +Storage storage_from_string(const char *s);