Changeset a29e7fc578381672499281e5e8a970082194417f

Timestamp:

07/14/11 16:24:47 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1310660687 -0400

git-parent:

[209711be5bf2a026e9d8d04fef2e05aaeb77c884]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1310660687 -0400

Message:

support logging of new connections on our own log stream {error,debug}/listener

Files:

• src/noit_listener.c (modified) (5 diffs)

src/noit_listener.c

@@ -47 +47 @@
-#include "noit_conf.h"
-
+static noit_log_stream_t nlerr = NULL;
+static noit_log_stream_t nldeb = NULL;
-static noit_hash_table listener_commands = NOIT_HASH_EMPTY;
-noit_hash_table *
@@ -90 +92 @@
-    }
-    e->closure = ac;
+    noitL(nlerr, "noit_listener[%s] SSL_accept on fd %d [%s]\n",
+          eventer_name_for_callback(e->callback),
+          e->fd, ac->remote_cn ? ac->remote_cn : "anonymous");
-    return e->callback(e, mask, e->closure, tv);
-  }
@@ -124 +129 @@
-    if(conn >= 0) {
-      eventer_t newe;
+      noitL(nlerr, "noit_listener[%s] accepted fd %d\n",
+            eventer_name_for_callback(listener_closure->dispatch_callback),
+            conn);
-      if(eventer_set_fd_nonblocking(conn)) {
-        close(conn);
@@ -217 +225 @@
-  const char *event_name;
-
-oit_debug
+ldeb
-        host, port, type, backlog,
-        (event_name = eventer_name_for_callback(handler))?event_name:"??",
@@ -521 +529 @@
-void
-noit_listener_init(const char *toplevel) {
+  nlerr = noit_log_stream_find("error/listener");
+  nldeb = noit_log_stream_find("debug/listener");
+  if(!nlerr) nlerr = noit_error;
+  if(!nldeb) nldeb = noit_debug;
-  eventer_name_callback("noit_listener_acceptor", noit_listener_acceptor);
-  eventer_name_callback("noit_listener_accept_ssl", noit_listener_accept_ssl);