Merge pull request #43 from ssahani/journal-structed-data

Various cleanups

Author: ssahani

Makefile

@@ -3,7 +3,7 @@ all: build
 .PHONY: all
 
 build:
-	meson build
+	meson setup build
 
 clean:
 	rm -rf build/

conf/systemd-netlogd.conf.in renamed to conf/netlogd.conf.in

@@ -1,5 +1,5 @@
 project('systemd-netlogd', 'c',
-        version : '1',
+        version : '1.3',
         license : 'LGPLv2+',
         default_options: [
                 'c_std=gnu99',
@@ -152,8 +152,8 @@ if not libcap.found()
 endif
 
 systemd_netlogd_conf = configure_file(
-                     input : 'conf/systemd-netlogd.conf.in',
-                     output : 'systemd-netlogd.conf',
+                     input : 'conf/netlogd.conf.in',
+                     output : 'netlogd.conf',
                      configuration : substs)
                      install_data(systemd_netlogd_conf,
                      install_dir : get_option('sysconfdir'))

meson.build

@@ -95,8 +95,8 @@ int config_parse_log_format(const char *unit,
 int manager_parse_config_file(Manager *m) {
         assert(m);
 
-        return config_parse_many(PKGSYSCONFDIR "/systemd-netlogd.conf",
-                                 CONF_PATHS_NULSTR("systemd/systemd-netlogd.conf.d"),
+        return config_parse_many(PKGSYSCONFDIR "/netlogd.conf",
+                                 CONF_PATHS_NULSTR("systemd/netlogd.conf.d"),
                                  "Network\0",
                                  config_item_perf_lookup, netlog_gperf_lookup,
                                  false, m);

src/netlog/netlog-conf.c

@@ -215,7 +215,7 @@ static int process_journal_input(Manager *m) {
         assert(m);
         assert(m->journal);
 
-        while (true) {
+        for (;;) {
                 r = sd_journal_next(m->journal);
                 if (r < 0) {
                         log_error_errno(r, "Failed to get next entry: %m");
@@ -342,8 +342,7 @@ static int manager_journal_monitor_listen(Manager *m) {
         if (m->last_cursor) {
                 r = sd_journal_seek_cursor(m->journal, m->last_cursor);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to seek to cursor %s: %m",
-                                               m->last_cursor);
+                        return log_error_errno(r, "Failed to seek to cursor %s: %m", m->last_cursor);
         }
 
         return 0;
@@ -473,10 +472,15 @@ int manager_new(const char *state_file, const char *cursor, Manager **ret) {
                 .log_format  = SYSLOG_TRANSMISSION_LOG_FORMAT_RFC_5424,
             };
 
+        socket_address_parse(&m->address, "239.0.0.1:6000");
+
+        if (!m->state_file)
+                return log_oom();
+
         if (cursor) {
                 m->last_cursor = strdup(cursor);
                 if (!m->last_cursor)
-                        return -ENOMEM;
+                        return log_oom();
         }
 
         r = sd_event_default(&m->event);