Changeset 1da42f7ee53fe062b95962b97d885d16c7363589

Timestamp:

10/26/09 19:38:54 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[c40e534ab56b44d80356a1b490d260db862e2dc4]

git-author:

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

Message:

fixes #202 flag-day(noitd,stratcond)

Files:

• src/noit_jlog_listener.c (modified) (3 diffs)
• src/stratcon_jlog_streamer.c (modified) (4 diffs)
• src/stratcon_jlog_streamer.h (modified) (1 diff)

src/noit_jlog_listener.c

@@ -208 +208 @@
-  acceptor_closure_t *ac = closure;
-  noit_jlog_closure_t *jcl = ac->service_ctx;
+  char errbuff[256];
+  const char *errstr = "unknown error";
-
-  if(mask & EVENTER_EXCEPTION || (jcl && jcl->wants_shutdown)) {
+    int len, nlen;
-socket_error:
-    /* Exceptions cause us to simply snip the connection */
+    len = strlen(errstr);
+    nlen = htonl(0 - len);
+    e->opset->write(e->fd, &nlen, sizeof(nlen), &newmask, e);
+    e->opset->write(e->fd, errstr, strlen(errstr), &newmask, e);
-    eventer_remove_fd(e->fd);
-    e->opset->close(e->fd, &newmask, e);
@@ -228 +235 @@
-                           strlen("log_transit_feed_name"),
-                           &logname)) {
-
+
+
-      goto socket_error;
-    }
-    ls = noit_log_stream_find(logname);
-    if(!ls) {
-
-
+
+
+
+
-      goto socket_error;
-    }
-    if(!ls->type || strcmp(ls->type, "jlog")) {
-
-
+
+
+
+
-      goto socket_error;
-    }
-    if(ac->cmd == NOIT_JLOG_DATA_FEED) {
-      if(!ac->remote_cn) {
-
+
+
-        goto socket_error;
-      }
@@ -268 +281 @@
-    jcl->jlog = jlog_new(path);
-    if(ac->cmd == NOIT_JLOG_DATA_TEMP_FEED)
-
-
-
+
+
+
+
+
+
+
-    if(jlog_ctx_open_reader(jcl->jlog, jcl->subscriber) == -1) {
-
-
+
+
+
+
+
-      goto socket_error;
-    }

src/stratcon_jlog_streamer.c

@@ -112 +112 @@
-        case JLOG_STREAMER_WANT_INITIATE: state = "initiate"; break;
-        case JLOG_STREAMER_WANT_COUNT: state = "waiting for next batch"; break;
+        case JLOG_STREAMER_WANT_ERROR: state = "waiting for error"; break;
-        case JLOG_STREAMER_WANT_HEADER: state = "reading header"; break;
-        case JLOG_STREAMER_WANT_BODY: state = "reading body"; break;
@@ -344 +345 @@
-        break;
-
+      case JLOG_STREAMER_WANT_ERROR:
+        FULLREAD(e, ctx, 0 - ctx->count);
+        noitL(noit_error, "[%s] %.*s\n", nctx->remote_str,
+              0 - ctx->count, ctx->buffer);
+        free(ctx->buffer); ctx->buffer = NULL;
+        goto socket_error;
+        break;
+
-      case JLOG_STREAMER_WANT_COUNT:
-        FULLREAD(e, ctx, sizeof(u_int32_t));
@@ -349 +358 @@
-        ctx->count = ntohl(dummy.count);
-        free(ctx->buffer); ctx->buffer = NULL;
-
+
+
+
+
-        break;
-
@@ -811 +823 @@
-        case JLOG_STREAMER_WANT_INITIATE: state = "initiate"; break;
-        case JLOG_STREAMER_WANT_COUNT: state = "waiting for next batch"; break;
+        case JLOG_STREAMER_WANT_ERROR: state = "waiting for error"; break;
-        case JLOG_STREAMER_WANT_HEADER: state = "reading header"; break;
-        case JLOG_STREAMER_WANT_BODY: state = "reading body"; break;

src/stratcon_jlog_streamer.h

@@ -79 +79 @@
-    JLOG_STREAMER_IS_ASYNC = 4,
-    JLOG_STREAMER_WANT_CHKPT = 5,
+    JLOG_STREAMER_WANT_ERROR = 6,
-  } state;
-  int count;            /* Number of jlog messages we need to read */