Changeset 67a2095e250dc562985ebc225064b0ef2a68ba2f

Timestamp:

02/11/08 20:32:47 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[341415bb3a391e0f7d77ab9be37c158397b5c0aa]

git-author:

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

Message:

convert elements to attributes... it seems more appropriate

Files:

• src/noit_check.c (modified) (4 diffs)
• src/noit_conf.c (modified) (5 diffs)
• src/noit_console.c (modified) (1 diff)
• src/sample.conf (modified) (1 diff)

src/noit_check.c

@@ -94 +94 @@
-    char module[256];
-    char name[256];
-
+ = ""
-    int no_period = 0;
-    int no_oncheck = 0;
@@ -101 +101 @@
-    noit_hash_table *options;
-
-
-
+
+
+
+
+
+
-      noitL(noit_stderr, "check %d has no uuid\n", i+1);
-      continue;
-    }
+
-    if(uuid_parse(uuid_str, uuid)) {
-      noitL(noit_stderr, "check uuid: '%s' is invalid\n", uuid_str);
-      continue;
-    }
-
-  noitL(noit_stderr, "check uuid: '%s' has no target\n",
-     
-
-
-noit_conf_get_stringbuf(sec[i], "ancestor-or-self::node()/module"
-
-      uuid_str)
-  continue;
-
-noit_conf_get_stringbuf(sec[i], "name", name, sizeof(name))) {
+
+if(!INHERIT(stringbuf, target, target, sizeof(target))) {
+noitL(noit_stderr, "check uuid: '%s' has no target\n",
+
+
+INHERIT(stringbuf, module
+ uuid_str);
+continue
+}
+
+MYATTR(stringbuf, name, name, sizeof(name)))
-      strlcpy(name, module, sizeof(name));
-
-noit_conf_get_int(sec[i], "ancestor-or-self::node()/period", &period)) {
+
+INHERIT(int, period, &period) || period == 0)
-      no_period = 1;
-
-
-
+
+
-      no_oncheck = 1;
-
+
-    if(no_period && no_oncheck) {
-      noitL(noit_stderr, "check uuid: '%s' has neither period nor oncheck\n",
@@ -136 +140 @@
-    }
-    if(!(no_period || no_oncheck)) {
-has on 
+on
-            uuid_str);
-      continue;
-    }
-noit_conf_get_int(sec[i], "ancestor-or-self::node()/timeout"
+INHERIT(int, timeout
-      noitL(noit_stderr, "check uuid: '%s' has no timeout\n", uuid_str);
-      continue;
@@ -211 +215 @@
-        dep->next = parent->causal_checks;
-        parent->causal_checks = dep;
+        noitL(noit_debug, "Causal map %s`%s --> %s`%s\n",
+              parent->target, parent->name, check->target, check->name);
-      }
-    }

src/noit_conf.c

@@ -362 +362 @@
-                         noit_console_state_t *state, void *closure) {
-  int i, cnt, titled = 0, cliplen = 0;
-
+, *basepath = NULL
-  char xpath[1024];
-
+ = NULL
-  xmlXPathObjectPtr pobj = NULL;
-  xmlXPathContextPtr current_ctxt;
@@ -373 +373 @@
-    return -1;
-  }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  if(!master_config) {
-    nc_printf(ncct, "no config\n");
@@ -393 +397 @@
-   * Ever notice how it is hard to describe xpath in C comments?
-   */
+  /* We don't want to show the root node */
-  cliplen = strlen("/noit/");
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-  current_ctxt = xpath_ctxt;
@@ -407 +415 @@
-    goto bad;
-  }
-  if(xmlXPathNodeSetIsEmpty(pobj->nodesetval)) {
-    nc_printf(ncct, "empty\n");
-  }
-  cnt = xmlXPathNodeSetGetLength(pobj->nodesetval);
-
-  titled = 0;
-  for(i=0; i<cnt; i++) {
@@ -423 +427 @@
-    }
-  }
-
+
+
+
+
+
+
+
+
+
+
+
-  titled = 0;
-  for(i=0; i<cnt; i++) {

src/noit_console.c

@@ -237 +237 @@
-  else if(i<0) nc_printf(ncct, "Error at offset: %d\n", 0-i);
-  else noit_console_state_do(ncct, cnt, cmds);
-  for(i=0;i<cnt;i++) {
-    nc_printf(ncct, "[%d] '%s'\n", i, cmds[i]);
-    free(cmds[i]);
-  }
-}
-

src/sample.conf

@@ -39 +39 @@
-  </listeners>
-  <checks>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </checks>
-</noit>