Merge pull request #124 from cgzones/manager_members

Manager struct cleanups

Author: ssahani

src/netlog/netlog-manager.c

@@ -16,8 +16,6 @@
 #include "string-util.h"
 #include "util.h"
 
-#define JOURNAL_SEND_POLL_TIMEOUT (10 * USEC_PER_SEC)
-
 /* Default severity LOG_NOTICE */
 #define JOURNAL_DEFAULT_SEVERITY LOG_PRI(LOG_NOTICE)
 
@@ -200,8 +198,8 @@ static int manager_read_journal_input(Manager *m) {
                                        message, hostname,
                                        pid,
                                        r >= 0 ? &tv : NULL,
-                                       structured_data,
-                                       msgid);
+                                       m->structured_data ? structured_data : NULL,
+                                       m->syslog_msgid ? msgid : NULL);
 }
 
 static int update_cursor_state(Manager *m) {
@@ -264,6 +262,7 @@ static int load_cursor_state(Manager *m) {
 }
 
 static int process_journal_input(Manager *m) {
+        _cleanup_free_ char *cursor = NULL;
         int r;
 
         assert(m);
@@ -279,7 +278,6 @@ static int process_journal_input(Manager *m) {
 
                 r = manager_read_journal_input(m);
                 if (r < 0) {
-                        m->current_cursor = mfree(m->current_cursor);
                         /* Can't send the message. Seek one entry back. */
                         r = sd_journal_previous(m->journal);
                         if (r < 0)
@@ -289,15 +287,15 @@ static int process_journal_input(Manager *m) {
                 }
         }
 
-        r = sd_journal_get_cursor(m->journal, &m->current_cursor);
+        r = sd_journal_get_cursor(m->journal, &cursor);
         if (r < 0) {
                 log_error_errno(r, "Failed to get cursor: %m");
-                m->current_cursor = mfree(m->current_cursor);
+                cursor = mfree(cursor);
         }
 
         free(m->last_cursor);
-        m->last_cursor = m->current_cursor;
-        m->current_cursor = NULL;
+        m->last_cursor = cursor;
+        cursor = NULL;
 
         return update_cursor_state(m);
 }
@@ -338,8 +336,6 @@ static void close_journal_input(Manager *m) {
                 sd_journal_close(m->journal);
                 m->journal = NULL;
         }
-
-        m->timeout = 0;
 }
 
 static int manager_signal_event_handler(sd_event_source *event, const struct signalfd_siginfo *si, void *userdata) {
@@ -391,13 +387,6 @@ static int manager_journal_monitor_listen(Manager *m) {
 
         events = sd_journal_get_events(m->journal);
 
-        r = sd_journal_reliable_fd(m->journal);
-        assert(r >= 0);
-        if (r > 0)
-                m->timeout = -1;
-        else
-                m->timeout = JOURNAL_SEND_POLL_TIMEOUT;
-
         r = sd_event_add_io(m->event, &m->event_journal_input, m->journal_watch_fd,
                             events, manager_journal_event_handler, m);
         if (r < 0)
@@ -516,15 +505,14 @@ int manager_resolve_handler(sd_resolve_query *q, int ret, const struct addrinfo
                         continue;
                 }
 
-                m->socklen = ai->ai_addrlen;
                 memcpy(&m->address.sockaddr, (const union sockaddr_union*) ai->ai_addr, ai->ai_addrlen);
 
                 if (ai->ai_addr->sa_family == AF_INET6)
                         m->address.sockaddr.in6.sin6_port = htobe16((uint16_t) m->port);
                 else
                         m->address.sockaddr.in.sin_port = htobe16((uint16_t) m->port);
 
-                sockaddr_pretty(&m->address.sockaddr.sa, m->socklen, true, true, &pretty);
+                sockaddr_pretty(&m->address.sockaddr.sa, ai->ai_addrlen, true, true, &pretty);
 
                 log_debug("Resolved address %s for %s.", pretty, m->server_name);
 
@@ -609,7 +597,6 @@ void manager_free(Manager *m) {
         free(m->server_name);
 
         free(m->last_cursor);
-        free(m->current_cursor);
 
         free(m->state_file);
         free(m->dir);
@@ -620,9 +607,6 @@ void manager_free(Manager *m) {
         sd_event_source_unref(m->network_event_source);
         sd_network_monitor_unref(m->network_monitor);
 
-        sd_event_source_unref(m->sigterm_event);
-        sd_event_source_unref(m->sigint_event);
-
         sd_event_source_unref(m->event_retry);
         sd_event_unref(m->event);
         free(m);

src/netlog/netlog-manager.h

@@ -36,12 +36,8 @@ struct Manager {
         sd_event *event;
 
         sd_event_source *event_journal_input;
-        uint64_t timeout;
-        usec_t retry_interval;
         usec_t connection_retry_usec;
 
-        sd_event_source *sigint_event, *sigterm_event;
-
         /* network */
         sd_event_source *network_event_source;
         sd_network_monitor *network_monitor;
@@ -53,14 +49,11 @@ struct Manager {
 
         /* peer */
         sd_resolve_query *resolve_query;
-        sd_event_source *event_receive;
-        sd_event_source *event_timeout;
 
         int socket;
 
         /* Multicast UDP address */
         SocketAddress address;
-        socklen_t socklen;
         uint32_t port;
 
         char *server_name;
@@ -73,7 +66,6 @@ struct Manager {
 
         char *state_file;
         char *last_cursor;
-        char *current_cursor;
         char *structured_data;
         char *dir;
         char *namespace;
@@ -97,7 +89,6 @@ struct Manager {
 
         size_t send_buffer;
 
-        usec_t timeout_usec;
         usec_t keep_alive_time;
         usec_t keep_alive_interval;
 };