Changeset d94c4d2a0febabfc7d914c1ff5ffc305f137b378

Timestamp:

02/01/10 17:35:06 (3 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[df5d2f09411fc779d39bc1fa5f3ff24ad0e5cff4]

git-author:

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

Message:

First attempt, refs #248

Files:

• src/stratcon_jlog_streamer.c (modified) (17 diffs)
• src/stratcond.c (modified) (1 diff)

src/stratcon_jlog_streamer.c

@@ -778 +778 @@
-void
-stratcon_jlog_streamer_reload(const char *toplevel) {
+  if(!stratcon_datastore_get_enabled()) return;
-  stratcon_streamer_connection(toplevel, NULL,
-                               stratcon_jlog_recv_handler,
@@ -791 +792 @@
-                            void *closure) {
-  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
-uuid_t 
+void *
-  int klen, n = 0, i;
-  void *vconn;
@@ -819 +820 @@
-  xmlDocPtr doc;
-  xmlNodePtr root;
+  noit_hash_table seen = NOIT_HASH_EMPTY;
-  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
-
-
+
+
+
-  void *vconn;
-  noit_connection_ctx_t **ctxs;
+  noit_conf_section_t *noit_configs;
-  struct timeval now, diff, last;
+  xmlNodePtr node;
+
-  gettimeofday(&now, NULL);
-
@@ -841 +847 @@
-  root = xmlNewDocNode(doc, NULL, (xmlChar *)"noits", NULL);
-  xmlDocSetRootElement(doc, root);
+
-  for(i=0; i<n; i++) {
-    char buff[256];
-    const char *feedtype = "unknown", *state = "unknown";
-    xmlNodePtr node;
-    noit_connection_ctx_t *ctx = ctxs[i];
-    jlog_streamer_ctx_t *jctx = ctx->consumer_ctx;
@@ -882 +888 @@
-      }
-    }
+    noit_hash_replace(&seen, strdup(ctx->remote_str), strlen(ctx->remote_str),
+                      0, free, NULL);
-    xmlSetProp(node, (xmlChar *)"remote", (xmlChar *)ctx->remote_str);
-    feedtype = feed_type_to_str(ntohl(jctx->jlog_feed_cmd));
@@ -938 +946 @@
-  free(ctxs);
-
+  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];
+    if(noit_conf_get_stringbuf(noit_configs[di], "self::node()/@address",
+                               address, sizeof(address))) {
+      void *v;
+      if(!noit_conf_get_stringbuf(noit_configs[di], "self::node()/@port",
+                                 port_str, sizeof(port_str)))
+        strlcpy(port_str, "43191", sizeof(port_str));
+      snprintf(remote_str, sizeof(remote_str), "%s:%s", address, port_str);
+      if(!noit_hash_retrieve(&seen, remote_str, strlen(remote_str), &v)) {
+        node = xmlNewNode(NULL, (xmlChar *)"noit");
+        xmlSetProp(node, (xmlChar *)"remote", (xmlChar *)remote_str);
+        xmlSetProp(node, (xmlChar *)"type", (xmlChar *)"durable/inactive");
+        xmlAddChild(root, node);
+      }
+    }
+  }
+  free(noit_configs);
+  noit_hash_destroy(&seen, free, NULL);
+
-  noit_http_response_ok(restc->http_ctx, "text/xml");
-  noit_http_response_xml(restc->http_ctx, doc);
@@ -945 +975 @@
-}
-static int
-
+
+
-  int cnt;
-  char path[256];
-  char port_str[6];
-  noit_conf_section_t *noit_configs, parent;
-
+, config, cnnode
-
-  snprintf(path, sizeof(path),
@@ -956 +987 @@
-  noit_configs = noit_conf_get_sections(NULL, path, &cnt);
-  free(noit_configs);
-0
+-1
-
-  parent = noit_conf_get_section(NULL, "//noits");
-0
+-1
-  snprintf(port_str, sizeof(port_str), "%d", port);
-  newnoit = xmlNewNode(NULL, (xmlChar *)"noit");
@@ -965 +996 @@
-  xmlSetProp(newnoit, (xmlChar *)"port", (xmlChar *)port_str);
-  xmlAddChild(parent, newnoit);
+  if(cn) {
+    config = xmlNewNode(NULL, (xmlChar *)"config");
+    cnnode = xmlNewNode(NULL, (xmlChar *)"cn");
+    xmlNodeAddContent(cnnode, (xmlChar *)cn);
+    xmlAddChild(config, cnnode);
+    xmlAddChild(newnoit, config);
+  }
-  if(stratcon_datastore_get_enabled())
-    stratcon_streamer_connection(NULL, target,
@@ -982 +1020 @@
-stratcon_remove_noit(const char *target, unsigned short port) {
-  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
-uuid_t 
-0
+void *
+-1
-  void *vconn;
-  noit_connection_ctx_t **ctx;
@@ -998 +1036 @@
-    xmlUnlinkNode(noit_configs[i]);
-    xmlFreeNode(noit_configs[i]);
+    n = 0;
-  }
-  free(noit_configs);
@@ -1022 +1061 @@
-rest_set_noit(noit_http_rest_closure_t *restc,
-              int npats, char **pats) {
+  void *vcn;
+  const char *cn = NULL;
-  noit_http_session_ctx *ctx = restc->http_ctx;
-  unsigned short port = 43191;
@@ -1027 +1068 @@
-    noit_http_response_server_error(ctx, "text/xml");
-  if(npats == 2) port = atoi(pats[1]);
-
+
+
+
+
-    noit_http_response_ok(ctx, "text/xml");
-  else
@@ -1045 +1089 @@
-    noit_http_response_server_error(ctx, "text/xml");
-  if(npats == 2) port = atoi(pats[1]);
-
+ >= 0
-    noit_http_response_ok(ctx, "text/xml");
-  else
@@ -1073 +1117 @@
-  else strlcpy(target, argv[0], sizeof(target));
-  if(adding) {
-)
+, NULL) >= 0
-      nc_printf(ncct, "Added noit at %s:%d\n", target, port);
-    }
@@ -1081 +1125 @@
-  }
-  else {
-
+ >= 0
-      nc_printf(ncct, "Removed noit at %s:%d\n", target, port);
-    }
@@ -1125 +1169 @@
-  register_console_streamer_commands();
-  stratcon_jlog_streamer_reload(toplevel);
+  stratcon_streamer_connection(toplevel, "", NULL, NULL, NULL, NULL);
-  assert(noit_http_rest_register_auth(
-    "GET", "/noits/", "^show$", rest_show_noits,

src/stratcond.c

@@ -252 +252 @@
-  }
-
+  stratcon_jlog_streamer_init(APPNAME);
+
-  if(stratcon_iep_get_enabled())
-    stratcon_iep_init();
-  if(stratcon_datastore_get_enabled()) {
-    stratcon_jlog_streamer_init(APPNAME);
-    /* Write our log out, and setup a watchdog to write it out on change. */
-    stratcon_datastore_saveconfig(NULL);