Changeset 129a0bae7c19dce74dfb70efd8e069b47209c6d8

Timestamp:

02/14/08 23:09:07 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[e01b3ad015472c9a83ced96738b07da543511a40]

git-author:

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

Message:

show checks

Files:

• src/noit_conf.c (modified) (12 diffs)

src/noit_conf.c

@@ -162 +162 @@
-  return sections;
-}
-
+ xmlNodePtr *vnode,
-                          const char *path, char **value) {
-  char *str;
@@ -183 +183 @@
-        i = xmlXPathNodeSetGetLength(pobj->nodesetval);
-        node = xmlXPathNodeSetItem(pobj->nodesetval, i-1);
+        if(vnode) *vnode = node;
-        *value = (char *)xmlXPathCastNodeToString(node);
-        break;
@@ -204 +205 @@
-                         const char *path, char **value) {
-  char *str;
-
+NULL,
-    *value = strdup(str);
-    return 1;
@@ -213 +214 @@
-                            const char *path, char *buf, int len) {
-  char *str;
-
+NULL,
-    strlcpy(buf, str, len);
-    return 1;
@@ -230 +231 @@
-  char *str;
-  long longval;
-noit_conf_get_string(section
+_noit_conf_get_string(section,NULL
-    int base = 10;
-    if(str[0] == '0') {
@@ -237 +238 @@
-    }
-    longval = strtol(str, NULL, base);
-    free(str);
-    *value = (int)longval;
-    return 1;
@@ -252 +252 @@
-                        const char *path, float *value) {
-  char *str;
-noit_conf_get_string(section
+_noit_conf_get_string(section,NULL
-    *value = atof(str);
-    free(str);
-    return 1;
-  }
@@ -268 +267 @@
-                          const char *path, noit_conf_boolean *value) {
-  char *str;
-noit_conf_get_string(section
+_noit_conf_get_string(section,NULL
-    if(!strcasecmp(str, "true")) *value = noit_true;
-    else *value = noit_false;
-    free(str);
-    return 1;
-  }
@@ -340 +338 @@
-  return 0;
-}
+static void
+nc_attr_show(noit_console_closure_t ncct, const char *name, xmlNodePtr cnode,
+             xmlNodePtr anode, const char *value) {
+  const char *cpath, *apath;
+  cpath = cnode ? (char *)xmlGetNodePath(cnode) : "";
+  apath = anode ? (char *)xmlGetNodePath(anode) : "";
+  nc_printf(ncct, " %s: %s", name, value ? value : "[undef]");
+  if(value && cpath && apath) {
+    int clen = strlen(cpath);
+    int plen = strlen("/noit/checks/");
+    if(!strncmp(cpath, apath, clen) && apath[clen] == '/') {
+      /* we have a match, which means it isn't inherited */
+    }
+    else {
+      nc_printf(ncct, " [inherited from %s]",
+                strlen(apath) > plen ? apath + plen : apath);
+    }
+  }
+  nc_write(ncct, "\n", 1);
+}
-static int
-noit_console_check(noit_console_closure_t ncct,
@@ -375 +393 @@
-  for(i=0; i<cnt; i++) {
-    uuid_t checkid;
-
+, anode, mnode = NULL
-    char *uuid_conf;
+    char *module, *value;
-
-    node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, i);
@@ -390 +409 @@
-    }
-    nc_printf(ncct, "==== %s ====\n", uuid_conf);
+
+#define MYATTR(a,n,b) _noit_conf_get_string(node, &(n), "@" #a, &(b))
+#define INHERIT(a,n,b) \
+  _noit_conf_get_string(node, &(n), "ancestor-or-self::node()/@" #a, &(b))
+#define SHOW_ATTR(a) do { \
+  anode = NULL; \
+  value = NULL; \
+  INHERIT(a, anode, value); \
+  nc_attr_show(ncct, #a, node, anode, value); \
+} while(0)
+
+    if(!INHERIT(module, mnode, module)) module = NULL;
+    if(MYATTR(name, anode, value))
+      nc_printf(ncct, " name: %s\n", value);
+    else
+      nc_printf(ncct, " name: %s [from module]\n", module ? module : "[undef]");
+    nc_attr_show(ncct, "module", node, mnode, module);
+    SHOW_ATTR(target);
+    SHOW_ATTR(period);
+    SHOW_ATTR(timeout);
+    SHOW_ATTR(oncheck);
-  }
- out:
@@ -737 +777 @@
-  if(path_len > max_len)
-    snprintf(info->prompt, sizeof(info->prompt),
-max_len -
+path_len - max_len +
-  else
-    snprintf(info->prompt, sizeof(info->prompt), pfmt, "", info->path);