Changeset be06bddffbd230aec8cb74a84859977d59173f06

Timestamp:

09/27/09 03:10:32 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[5b7de2315924e3efa701f5ff9fa9238c673e62e7]

git-author:

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

Message:

refactor this and expose some of the bits as helpful utility functions, refs #171

Files:

• src/noit_check_rest.c (modified) (6 diffs)
• src/noit_check_rest.h (modified) (2 diffs)

src/noit_check_rest.c

@@ -48 +48 @@
-#define UUID_REGEX "[0-9a-fA-F]{4}(?:[0-9a-fA-F]{4}-){4}[0-9a-fA-F]{12}"
-
+#define NODE_CONTENT(parent, k, v) do { \
+  xmlNodePtr tmp; \
+  if(v) { \
+    tmp = xmlNewNode(NULL, (xmlChar *)(k)); \
+    xmlNodeAddContent(tmp, (xmlChar *)(v)); \
+    xmlAddChild(parent, tmp); \
+  } \
+} while(0)
+
+xmlNodePtr
+noit_check_state_as_xml(noit_check_t *check) {
+  xmlNodePtr state, tmp, metrics;
+  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
+  const char *k;
+  int klen;
+  void *data;
+  stats_t *c = &check->stats.current;
+
+  state = xmlNewNode(NULL, (xmlChar *)"state");
+  NODE_CONTENT(state, "running", NOIT_CHECK_RUNNING(check)?"true":"false");
+  NODE_CONTENT(state, "killed", NOIT_CHECK_KILLED(check)?"true":"false");
+  NODE_CONTENT(state, "configured",
+               NOIT_CHECK_CONFIGURED(check)?"true":"false");
+  NODE_CONTENT(state, "disabled", NOIT_CHECK_DISABLED(check)?"true":"false");
+  xmlAddChild(state, (tmp = xmlNewNode(NULL, (xmlChar *)"last_run")));
+  if(check->stats.current.whence.tv_sec) {
+    struct timeval f = check->stats.current.whence;
+    struct timeval n;
+    char timestr[20];
+    gettimeofday(&n, NULL);
+    snprintf(timestr, sizeof(timestr), "%0.3f",
+             n.tv_sec + (n.tv_usec / 1000000.0));
+    xmlSetProp(tmp, (xmlChar *)"now", (xmlChar *)timestr);
+    snprintf(timestr, sizeof(timestr), "%0.3f",
+             f.tv_sec + (f.tv_usec / 1000000.0));
+    xmlNodeAddContent(tmp, (xmlChar *)timestr);
+  }
+  if(c->available) { /* truth here means the check has been run */
+    char buff[20];
+    snprintf(buff, sizeof(buff), "%0.3f", (float)c->duration/1000.0);
+    NODE_CONTENT(state, "runtime", buff);
+  }
+  NODE_CONTENT(state, "availability",
+               noit_check_available_string(c->available));
+  NODE_CONTENT(state, "state", noit_check_state_string(c->state));
+  NODE_CONTENT(state, "status", c->status ? c->status : "");
+  memset(&iter, 0, sizeof(iter));
+  xmlAddChild(state, (metrics = xmlNewNode(NULL, (xmlChar *)"metrics")));
+  while(noit_hash_next(&c->metrics, &iter, &k, &klen, &data)) {
+    char buff[256];
+    metric_t *m = (metric_t *)data;
+    xmlAddChild(metrics, (tmp = xmlNewNode(NULL, (xmlChar *)m->metric_name)));
+    buff[0] = m->metric_type; buff[1] = '\0';
+    xmlSetProp(tmp, (xmlChar *)"type", (xmlChar *)buff);
+    if(m->metric_value.s) {
+      int rv;
+      rv = noit_stats_snprint_metric_value(buff, sizeof(buff), m);
+      if(rv < 0)
+        xmlSetProp(tmp, (xmlChar *)"error", (xmlChar *)"unknown type");
+      else
+        xmlNodeAddContent(tmp, (xmlChar *)buff);
+    }
+  }
+  return state;
+}
+
-static int
-rest_show_check(noit_http_rest_closure_t *restc,
@@ -55 +121 @@
-  xmlXPathContextPtr xpath_ctxt = NULL;
-  xmlDocPtr doc = NULL;
-, metrics
+
-  uuid_t checkid;
-  noit_check_t *check;
@@ -112 +178 @@
-  } \
-} while(0)
-#define NODE_CONTENT(parent, k, v) do { \
-  xmlNodePtr tmp; \
-  if(v) { \
-    tmp = xmlNewNode(NULL, (xmlChar *)(k)); \
-    xmlNodeAddContent(tmp, (xmlChar *)(v)); \
-    xmlAddChild(parent, tmp); \
-  } \
-} while(0)
-
-  attr = xmlNewNode(NULL, (xmlChar *)"attributes");
@@ -152 +210 @@
-
-  /* Add the state */
-  xmlAddChild(root, (state = xmlNewNode(NULL, (xmlChar *)"state")));
-  check = noit_poller_lookup(checkid);
-
+
+
-    xmlSetProp(state, (xmlChar *)"error", (xmlChar *)"true");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-  noit_http_response_ok(ctx, "text/xml");
-  noit_http_response_xml(ctx, doc);
@@ -225 +239 @@
-}
-
-static 
-validate_check
-
+
+noit_validate_check_rest
+          
-  xmlNodePtr root, tl, an;
-  int name=0, module=0, target=0, period=0, timeout=0, filterset=0;
@@ -461 +475 @@
-  if(!complete) return mask;
-  if(indoc == NULL) FAIL("xml parse error");
-validate_check
+noit_validate_check_rest
-
-  if(uuid_parse(pats[1], checkid)) goto error;

src/noit_check_rest.h

@@ -38 +38 @@
-#include "noit_conf.h"
-
+#include <libxml/tree.h>
+
-#ifndef NOIT_CHECK_REST_H
-#define NOIT_CHECK_REST_H
@@ -44 +46 @@
-  noit_check_rest_init();
-
+API_EXPORT(int)
+  noit_validate_check_rest_post(xmlDocPtr doc, xmlNodePtr *a, xmlNodePtr *c,
+                                const char **error);
+
+API_EXPORT(xmlNodePtr)
+  noit_check_state_as_xml(noit_check_t *check);
+
-#endif