Changeset 2ccf5eb9e64a6e89f4c8e0022eee38cde7e74717

Timestamp:

05/14/08 19:09:15 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[be8707fb024addfa6eb855a9d160e6f2b5afec3f]

git-author:

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

Message:

I think this finishes up #15. I'll not close just yet as I'm not sure how safe it is to reload all the checks without regard if their are in-flight or not. refs #51

Files:

• src/noit_conf.c (modified) (1 diff)
• src/noit_conf_checks.c (modified) (9 diffs)

src/noit_conf.c

@@ -177 +177 @@
-  if(cnt > 1) {
-    parent_node = xmlXPathNodeSetItem(pobj->nodesetval, cnt-2);
-
+
+
-  }
-  /* 2. */

src/noit_conf_checks.c

@@ -487 +487 @@
-    return -1;
-  }
+  if(!strcmp(argv[0], "config")) {
+    nc_printf(ncct, "use 'config' to set check config options\n");
+    return -1;
+  }
-  info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
-  if(!strcmp(info->path, "/")) {
@@ -623 +627 @@
-                         int argc, char **argv,
-                         noit_console_state_t *state, void *closure) {
+  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
+  const char *k;
+  int klen;
+  void *data;
-  int i, cnt, titled = 0, cliplen = 0;
-  const char *path = "", *basepath = NULL;
-  char xpath[1024];
-  noit_conf_t_userdata_t *info = NULL;
+  noit_hash_table *config;
-  xmlXPathObjectPtr pobj = NULL;
-  xmlXPathContextPtr xpath_ctxt = NULL, current_ctxt;
@@ -693 +702 @@
-  xmlXPathFreeObject(pobj);
-
+  /* Print out all the config settings */
+  titled = 0;
+  config = noit_conf_get_hash(node, "config");
+  while(noit_hash_next(config, &iter, &k, &klen, &data)) {
+    if(!titled++) nc_printf(ncct, "== Section [Aggregated] Config ==\n");
+    nc_printf(ncct, "config::%s: %s\n", k, (const char *)data);
+  }
+  noit_hash_destroy(config, free, free);
+  free(config);
+
-  /* _shorten string_ turning last { / @ * } to { / * } */
-  strlcpy(xpath + strlen(xpath) - 2, "*", 2);
@@ -705 +724 @@
-    node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, i);
-    if(!strcmp((char *)node->name, "check")) continue;
+    if(!strcmp((char *)xmlGetNodePath(node) + cliplen, "config")) continue;
-    if(!(node->children && node->children == xmlGetLastChild(node) &&
-         xmlNodeIsText(node->children))) {
@@ -833 +853 @@
-
-  noit_conf_xml_xpath(NULL, &xpath_ctxt);
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  snprintf(xpath, sizeof(xpath), "/noit/%s", path);
-  pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
@@ -875 +895 @@
-    }
-  }
+#ifdef UNSAFE_RECONFIG
-  if(active) {
-    nc_printf(ncct, "Cannot set '%s', it would effect %d live check(s)\n",
@@ -880 +901 @@
-    goto out;
-  }
+#endif
-  if(pobj) xmlXPathFreeObject(pobj);
-
@@ -918 +940 @@
-    assert(confignode);
-    /* Now we create a child */
-
-
+
-    
-  }
@@ -1167 +1188 @@
-  ADD_CMD(_conf_t_state, "ls", noit_console_config_show, NULL, NULL);
-  ADD_CMD(_conf_t_state, "cd", noit_console_config_cd, NULL, NULL);
+  ADD_CMD(_conf_t_state, "config", noit_console_config_setconfig, NULL, NULL);
-  ADD_CMD(_conf_t_state, "section", noit_console_config_section, NULL, (void *)0);
-  ADD_CMD(_conf_t_state, "check", noit_console_check, _conf_t_check_state, NULL);