Ticket #44: lighty-spread.patch

mod_accesslog.c

@@ -27 +27 @@
 # include <syslog.h>
 #endif
 
+#include <sp.h>
+
 typedef struct {
         char key;
         enum {
@@ -124 +126 @@
         size_t size;
 } format_fields;
 
+mailbox spread_mailbox;
+char groups[MAX_GROUP_NAME];
+
 typedef struct {
         buffer *access_logfile;
         buffer *format;
         unsigned short use_syslog;
 
+  buffer *spread_location;
+  buffer *spread_group;
 
+
         int    log_access_fd;
         time_t last_generated_accesslog_ts;
         time_t *last_generated_accesslog_ts_ptr;
@@ -148 +156 @@
         plugin_config conf;
 } plugin_data;
 
+void connect_to_spread(const char* location)
+{
+  SP_disconnect(spread_mailbox);
+  SP_connect(location, 0, 0, 0, &spread_mailbox, groups);
+}
+
+void disconnect_from_spread()
+{
+  SP_disconnect(spread_mailbox);
+}
+
 INIT_FUNC(mod_accesslog_init) {
         plugin_data *p;
 
@@ -370 +389 @@
                         buffer_free(s->access_logbuffer);
                         buffer_free(s->format);
                         buffer_free(s->access_logfile);
+                        buffer_free(s->spread_location);
+                        buffer_free(s->spread_group);
 
                         if (s->parsed_format) {
                                 size_t j;
@@ -400 +421 @@
                 { "accesslog.filename",             NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
                 { "accesslog.use-syslog",           NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },
                 { "accesslog.format",               NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
+                { "accesslog.spread_location",      NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
+                { "accesslog.spread_group",         NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
                 { NULL,                             NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
         };
 
@@ -412 +435 @@
 
                 s = calloc(1, sizeof(plugin_config));
                 s->access_logfile = buffer_init();
+                s->spread_location = buffer_init();
+                s->spread_group = buffer_init();
                 s->format = buffer_init();
                 s->access_logbuffer = buffer_init();
                 s->ts_accesslog_str = buffer_init();
@@ -423 +448 @@
                 cv[0].destination = s->access_logfile;
                 cv[1].destination = &(s->use_syslog);
                 cv[2].destination = s->format;
+                cv[3].destination = s->spread_location;
+                cv[4].destination = s->spread_group;
 
+
+    connect_to_spread(s->spread_location->ptr);
+
                 p->config_storage[i] = s;
 
                 if (0 != config_insert_values_global(srv, ((data_config *)srv->config_context->data[i])->value, cv)) {
@@ -595 +625 @@
         plugin_config *s = p->config_storage[0];
 
         PATCH(access_logfile);
+        PATCH(spread_location);
+        PATCH(spread_group);
         PATCH(format);
         PATCH(log_access_fd);
         PATCH(last_generated_accesslog_ts_ptr);
@@ -663 +695 @@
 
                                 /* cache the generated timestamp */
                                 if (srv->cur_ts != *(p->conf.last_generated_accesslog_ts_ptr)) {
-                                        struct tm tm;
 #if defined(HAVE_STRUCT_TM_GMTOFF)
                                         long scd, hrs, min;
 #endif
@@ -671 +702 @@
                                         buffer_prepare_copy(p->conf.ts_accesslog_str, 255);
 #if defined(HAVE_STRUCT_TM_GMTOFF)
 # ifdef HAVE_LOCALTIME_R
+                                        struct tm tm;
                                         localtime_r(&(srv->cur_ts), &tm);
                                         strftime(p->conf.ts_accesslog_str->ptr, p->conf.ts_accesslog_str->size - 1, "[%d/%b/%Y:%H:%M:%S ", &tm);
 # else
@@ -838 +870 @@
         }
 
         BUFFER_APPEND_STRING_CONST(b, "\n");
+  int result = 0;
+  if (p->conf.spread_location->used > 0)
+  {
+    result = SP_multicast(spread_mailbox, RELIABLE_MESS, p->conf.spread_group->ptr, 1, b->used - 1, b->ptr);
+    if (result < 0)
+    {
+      connect_to_spread(p->conf.spread_location->ptr);
+    }
+  }
 
         if (p->conf.use_syslog ||  /* syslog doesn't cache */
             (p->conf.access_logfile->used && p->conf.access_logfile->ptr[0] == '|') || /* pipes don't cache */