X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald.h;h=e3ef3b529d5385460790abcac2c2a943c92b1f89;hb=0ce8860a15fb08ac358fb9c5347bd20c0bcdebcd;hp=b73be0ab35d0727dd4accf8632a2550a2c309417;hpb=ef63833d532dd86bdba63211e6a1363cbb3ef61d;p=elogind.git

diff --git a/src/journal/journald.h b/src/journal/journald.h
index b73be0ab3..e3ef3b529 100644
--- a/src/journal/journald.h
+++ b/src/journal/journald.h
@@ -22,14 +22,15 @@
 ***/
 
 #include <inttypes.h>
-#include <sys/types.h>
 #include <stdbool.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 
 #include "journal-file.h"
 #include "hashmap.h"
 #include "util.h"
 #include "audit.h"
-#include "journal-rate-limit.h"
+#include "journald-rate-limit.h"
 #include "list.h"
 
 typedef enum Storage {
@@ -41,6 +42,14 @@ typedef enum Storage {
         _STORAGE_INVALID = -1
 } Storage;
 
+typedef enum SplitMode {
+        SPLIT_LOGIN,
+        SPLIT_UID,
+        SPLIT_NONE,
+        _SPLIT_MAX,
+        _SPLIT_INVALID = -1
+} SplitMode;
+
 typedef struct StdoutStream StdoutStream;
 
 typedef struct Server {
@@ -74,11 +83,18 @@ typedef struct Server {
         bool forward_to_syslog;
         bool forward_to_console;
 
+        unsigned n_forward_syslog_missed;
+        usec_t last_warn_forward_syslog_missed;
+
         uint64_t cached_available_space;
         usec_t cached_available_space_timestamp;
 
         uint64_t var_available_timestamp;
 
+        usec_t max_retention_usec;
+        usec_t max_file_usec;
+        usec_t oldest_file_usec;
+
         gid_t file_gid;
         bool file_gid_valid;
 
@@ -93,6 +109,7 @@ typedef struct Server {
         int max_level_console;
 
         Storage storage;
+        SplitMode split_mode;
 
         MMapCache *mmap;
 
@@ -108,7 +125,6 @@ typedef struct Server {
 #define N_IOVEC_UDEV_FIELDS 32
 
 void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigned m, struct ucred *ucred, struct timeval *tv, const char *label, size_t label_len, const char *unit_id, int priority);
-
 void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...);
 
 /* gperf lookup function */
@@ -119,5 +135,7 @@ int config_parse_storage(const char *filename, unsigned line, const char *sectio
 const char *storage_to_string(Storage s);
 Storage storage_from_string(const char *s);
 
-int syslog_fixup_facility(int priority);
-void syslog_read_identifier(const char **buf, char **identifier, char **pid);
+int config_parse_split_mode(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+
+const char *split_mode_to_string(SplitMode s);
+SplitMode split_mode_from_string(const char *s);