Changeset 3c56016c44ec467d9baa6ed0d667e21bf44f81cb

Timestamp:

09/23/09 00:22:56 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1253665376 +0000

git-parent:

[75ee62d07972a0eb07cde464b4d2244abd0b06ec]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1253665376 +0000

Message:

insert the new rest API as a shim between the http listener and the realtime streamer -- for future extensibility

Files:

• src/Makefile.in (modified) (1 diff)
• src/noit_rest.c (modified) (4 diffs)
• src/noit_rest.h (modified) (2 diffs)
• src/stratcon_realtime_http.c (modified) (4 diffs)
• src/stratcond.c (modified) (2 diffs)

src/Makefile.in

@@ -46 +46 @@
-        noit_console.o noit_console_state.o noit_console_telnet.o \
-        noit_console_complete.o noit_xml.o \
-
+rest.o noit_
-        stratcon_realtime_http.o \
-        stratcon_jlog_streamer.o stratcon_datastore.o \

src/noit_rest.c

@@ -173 +173 @@
-  restc->fastpath = NULL;
-}
-static 
+
-noit_http_rest_closure_free(noit_http_rest_closure_t *restc) {
-  free(restc->remote_cn);
@@ -218 +218 @@
-    const char *primer = "";
-    ac->service_ctx = restc = noit_http_rest_closure_alloc();
+    restc->ac = ac;
-    restc->remote_cn = strdup(ac->remote_cn ? ac->remote_cn : "");
-    restc->http_ctx =
@@ -243 +244 @@
-    }
-    noit_http_session_prime_input(restc->http_ctx, primer, 4);
+  }
+  return restc->http_ctx->drive(e, mask, restc->http_ctx, now);
+}
+
+int
+noit_http_rest_raw_handler(eventer_t e, int mask, void *closure,
+                           struct timeval *now) {
+  int newmask = EVENTER_READ | EVENTER_EXCEPTION;
+  acceptor_closure_t *ac = closure;
+  noit_http_rest_closure_t *restc = ac->service_ctx;
+
+  if(mask & EVENTER_EXCEPTION || (restc && restc->wants_shutdown)) {
+    /* Exceptions cause us to simply snip the connection */
+    eventer_remove_fd(e->fd);
+    e->opset->close(e->fd, &newmask, e);
+    if(restc) noit_http_rest_closure_free(restc);
+    if(ac) acceptor_closure_free(ac);
+    return 0;
+  }
+  if(!ac->service_ctx) {
+    ac->service_ctx = restc = noit_http_rest_closure_alloc();
+    restc->ac = ac;
+    restc->http_ctx =
+        noit_http_session_ctx_new(noit_rest_request_dispatcher,
+                                  restc, e);
-  }
-  return restc->http_ctx->drive(e, mask, restc->http_ctx, now);
@@ -296 +322 @@
-}
-void noit_http_rest_init() {
-
+
+
-  noit_control_dispatch_delegate(noit_control_dispatch,
-                                 NOIT_CONTROL_DELETE,

src/noit_rest.h

@@ -51 +51 @@
-struct noit_http_rest_closure {
-  noit_http_session_ctx *http_ctx;
+  acceptor_closure_t *ac;
-  char *remote_cn;
-  rest_request_handler fastpath;
@@ -70 +71 @@
-                      int *mask, int *complete) ;
-
+API_EXPORT(void)
+  noit_http_rest_closure_free(noit_http_rest_closure_t *restc);
+
-#endif

src/stratcon_realtime_http.c

@@ -40 +40 @@
-#include "noit_listener.h"
-#include "noit_http.h"
+#include "noit_rest.h"
-#include "noit_livestream_listener.h"
-#include "stratcon_realtime_http.h"
@@ -438 +439 @@
-  return EVENTER_EXCEPTION;
-}
-
-int
-stratcon_realtime_http_handler(eventer_t e, int mask, void *closure,
@@ -444 +444 @@
-  acceptor_closure_t *ac = closure;
-  noit_http_session_ctx *http_ctx = ac->service_ctx;
-  if(!http_ctx) {
-    const char *document_domain = NULL;
-
-    if(!noit_hash_retr_str(ac->config,
-                           "document_domain", strlen("document_domain"),
-                           &document_domain)) {
-      noitL(noit_error, "Document domain not set!  Realtime streaming will be broken\n");
-      document_domain = "";
-    }
-
-    http_ctx = ac->service_ctx =
-      noit_http_session_ctx_new(stratcon_request_dispatcher,
-                                alloc_realtime_context(document_domain),
-                                e);
-  }
-  return http_ctx->drive(e, mask, http_ctx, now);
+}
+static int
+rest_stream_data(noit_http_rest_closure_t *restc,
+                 int npats, char **pats) {
+  /* We're here and want to subvert the rest system */
+  const char *document_domain = NULL;
+  noit_http_session_ctx *ctx = restc->http_ctx;
+
+  /* Rewire the handler */
+  restc->ac->service_ctx = ctx;
+
+  if(!noit_hash_retr_str(restc->ac->config,
+                         "document_domain", strlen("document_domain"),
+                         &document_domain)) {
+    noitL(noit_error, "Document domain not set!  Realtime streaming will be broken\n");
+    document_domain = "";
+  }
+  noit_http_rest_closure_free(restc);
+
+  /* Rewire the http context */
+  ctx->conn.e->callback = stratcon_realtime_http_handler;
+  ctx->dispatcher = stratcon_request_dispatcher;
+  ctx->dispatcher_closure = alloc_realtime_context(document_domain);
+  //ctx->drive = stratcon_realtime_http_handler;
+  return stratcon_request_dispatcher(ctx);
-}
-
@@ -466 +476 @@
-  eventer_name_callback("stratcon_realtime_http",
-                        stratcon_realtime_http_handler);
-
+
+
+
+
+

src/stratcond.c

@@ -49 +49 @@
-#include "noit_module.h"
-#include "noit_conf.h"
+#include "noit_rest.h"
-#include "stratcon_jlog_streamer.h"
-#include "stratcon_datastore.h"
@@ -170 +171 @@
-
-  noit_console_init(APPNAME);
+  noit_http_rest_init();
-  stratcon_realtime_http_init(APPNAME);
-  noit_listener_init(APPNAME);