Changeset c07a479ca7158c58ebf6036351e6a4e1191a54e1

Timestamp:

02/12/10 16:31:14 (3 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[3c6e7b2c6c3b65676bb51326a13b12d505806bce]

git-author:

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

Message:

fixes #256

Files:

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

src/stratcon_jlog_streamer.c

@@ -877 +877 @@
-  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
-  char path[256];
-type
-
+str
+, *want_cn = NULL
-  int klen, n = 0, i, di, cnt;
-  void *vconn;
@@ -887 +887 @@
-
-  noit_http_process_querystring(&restc->http_ctx->req);
-
-
+
+
+
+
-
-  gettimeofday(&now, NULL);
@@ -917 +919 @@
-    /* If the user requested a specific type and we're not it, skip. */
-    if(type && strcmp(feedtype, type)) continue;
+    /* If the user wants a specific CN... limit to that. */
+    if(want_cn && (!ctx->remote_cn || strcmp(want_cn, ctx->remote_cn)))
+      continue;
-
-    node = xmlNewNode(NULL, (xmlChar *)"noit");
@@ -1009 +1014 @@
-  free(ctxs);
-
-type &&
+!type ||
-    snprintf(path, sizeof(path), "//noits//noit");
-    noit_configs = noit_conf_get_sections(NULL, path, &cnt);
-    for(di=0; di<cnt; di++) {
-      char address[64], port_str[32], remote_str[98];
+      char expected_cn_buff[256], *expected_cn = NULL;
+      if(noit_conf_get_stringbuf(noit_configs[di], "self::node()/config/cn",
+                                 expected_cn_buff, sizeof(expected_cn_buff)))
+        expected_cn = expected_cn_buff;
+      if(want_cn && (!expected_cn || strcmp(want_cn, expected_cn))) continue;
-      if(noit_conf_get_stringbuf(noit_configs[di], "self::node()/@address",
-                                 address, sizeof(address))) {
@@ -1020 +1030 @@
-                                   port_str, sizeof(port_str)))
-          strlcpy(port_str, "43191", sizeof(port_str));
+
+        /* If the user wants a specific CN... limit to that. */
+          if(want_cn && (!expected_cn || strcmp(want_cn, expected_cn)))
+            continue;
+
-        snprintf(remote_str, sizeof(remote_str), "%s:%s", address, port_str);
-        if(!noit_hash_retrieve(&seen, remote_str, strlen(remote_str), &v)) {
-          char expected_cn[256];
-          node = xmlNewNode(NULL, (xmlChar *)"noit");
-          xmlSetProp(node, (xmlChar *)"remote", (xmlChar *)remote_str);
-          xmlSetProp(node, (xmlChar *)"type", (xmlChar *)"configured");
-
-
+
-            xmlSetProp(node, (xmlChar *)"cn", (xmlChar *)expected_cn);
-          xmlAddChild(root, node);