Report about syntax errors with metadata

[elogind.git] / src / journal / journald-server.h

diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
index 9f50a29e50c960f8d634f7ca7ef47de13fc7ab71..fb4e8e4c3dbde7d0ca3d3bb14279bb55bae0edf6 100644 (file)
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -71,6 +71,7 @@ typedef struct Server {
         size_t buffer_size;
 
         JournalRateLimit *rate_limit;
         size_t buffer_size;
 
         JournalRateLimit *rate_limit;

+        usec_t sync_interval_usec;

         usec_t rate_limit_interval;
         unsigned rate_limit_burst;
 
         usec_t rate_limit_interval;
         unsigned rate_limit_burst;
 


@@ -119,6 +120,9 @@ typedef struct Server {
         uint64_t *kernel_seqnum;
 
         struct udev *udev;
         uint64_t *kernel_seqnum;
 
         struct udev *udev;

+
+        int sync_timer_fd;
+        bool sync_scheduled;

 } Server;
 
 #define N_IOVEC_META_FIELDS 17
 } Server;
 
 #define N_IOVEC_META_FIELDS 17


@@ -131,12 +135,12 @@ void server_driver_message(Server *s, sd_id128_t message_id, const char *format,
 /* gperf lookup function */
 const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length);
 
 /* gperf lookup function */
 const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length);
 

-int config_parse_storage(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+int config_parse_storage(const char *unit, 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);
 
 
 const char *storage_to_string(Storage s);
 Storage storage_from_string(const char *s);
 

-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);
+int config_parse_split_mode(const char *unit, 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);
 
 const char *split_mode_to_string(SplitMode s);
 SplitMode split_mode_from_string(const char *s);


@@ -145,8 +149,10 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid);
 bool shall_try_append_again(JournalFile *f, int r);
 int server_init(Server *s);
 void server_done(Server *s);
 bool shall_try_append_again(JournalFile *f, int r);
 int server_init(Server *s);
 void server_done(Server *s);

+void server_sync(Server *s);

 void server_vacuum(Server *s);
 void server_rotate(Server *s);
 void server_vacuum(Server *s);
 void server_rotate(Server *s);

+int server_schedule_sync(Server *s);

 int server_flush_to_var(Server *s);
 int process_event(Server *s, struct epoll_event *ev);
 void server_maybe_append_tags(Server *s);
 int server_flush_to_var(Server *s);
 int process_event(Server *s, struct epoll_event *ev);
 void server_maybe_append_tags(Server *s);