Changeset 2417a3262808d93c08cb01f0c7dfc7a7d40df766

Timestamp:

06/14/12 16:02:57 (1 year ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[4496cc4e7850184a250647f0a956c335c15f5f18]

git-author:

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

Message:

Allow livestreaming to attach to the non-transient check.

If a period of 0 is provided, just add this livestream as
a feed on the master check. It won't show up in watches, but
it acts like a normal watch.

Files:

• src/noit_check.c (modified) (1 diff)
• src/noit_conf_checks.c (modified) (1 diff)
• src/noit_livestream_listener.c (modified) (3 diffs)

src/noit_check.c

@@ -594 +594 @@
-
-  uuid_unparse_lower(in, uuid_str);
+
+  noitL(noit_error, "noit_check_watch(%s,%d)\n", uuid_str, period);
+  if(period == 0) {
+    return noit_poller_lookup(in);
+  }
+
-  /* Find the check */
-  snprintf(xpath, sizeof(xpath), "//checks//check[@uuid=\"%s\"]", uuid_str);

src/noit_conf_checks.c

@@ -534 +534 @@
-                  noit_check_state_string(c->state));
-        nc_printf(ncct, " status: %s\n", c->status ? c->status : "[[null]]");
+        nc_printf(ncct, " feeds: %d\n", check->feeds ? check->feeds->size : 0);
-        nc_printf(ncct, " metrics:\n");
-        memset(&iter, 0, sizeof(iter));

src/noit_livestream_listener.c

@@ -53 +53 @@
-typedef struct {
-  u_int32_t period;
+  noit_boolean period_read;
-  struct log_entry *lqueue;
-  struct log_entry *lqueue_end;
@@ -238 +239 @@
-    /* Setup logger to this channel */
-    noitL(noit_debug, "livestream initializing on fd %d\n", e->fd);
-
+_read
-      u_int32_t nperiod;
-      len = e->opset->read(e->fd, &nperiod, sizeof(nperiod), &mask, e);
@@ -244 +245 @@
-      if(len != sizeof(nperiod)) goto socket_error;
-      jcl->period = ntohl(nperiod);
-
-
-
-
+
-      noitL(noit_debug, "livestream initializing on fd %d [period %d]\n",
-            e->fd, jcl->period);