Changeset e01b3ad015472c9a83ced96738b07da543511a40

Timestamp:

02/13/08 22:50:43 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[6e90b3f8072e3e74ee6b01f01b9b1be2e207738f]

git-author:

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

Message:

check, check, 1, 2, 3

Files:

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

src/noit_check.c

@@ -85 +85 @@
-void
-noit_poller_process_checks(const char *xpath) {
-
+flags, 
-  noit_conf_section_t *sec;
-  __config_load_generation++;
@@ -99 +99 @@
-    int no_oncheck = 0;
-    int period = 0, timeout = 0;
-
+, busted = noit_false
-    uuid_t uuid, out_uuid;
-    noit_hash_table *options;
@@ -120 +120 @@
-    if(!INHERIT(stringbuf, target, target, sizeof(target))) {
-      noitL(noit_stderr, "check uuid: '%s' has no target\n", uuid_str);
-disabl
+bust
-    }
-    if(!INHERIT(stringbuf, module, module, sizeof(module))) {
-      noitL(noit_stderr, "check uuid: '%s' has no module\n", uuid_str);
-disabl
+bust
-    }
-
@@ -139 +139 @@
-      noitL(noit_stderr, "check uuid: '%s' has neither period nor oncheck\n",
-            uuid_str);
-disabl
+bust
-    }
-    if(!(no_period || no_oncheck)) {
-      noitL(noit_stderr, "check uuid: '%s' has oncheck and period.\n",
-            uuid_str);
-disabl
+bust
-    }
-    if(!INHERIT(int, timeout, &timeout)) {
-      noitL(noit_stderr, "check uuid: '%s' has no timeout\n", uuid_str);
-disabl
+bust
-    }
-    if(!no_period && timeout >= period) {
@@ -155 +155 @@
-    }
-    options = noit_conf_get_hash(sec[i], "ancestor-or-self::node()/config/*");
+
+    flags = 0;
+    if(busted) flags |= NP_UNCONFIG;
+    if(disabled) flags |= NP_DISABLED;
-
-    if(noit_hash_retrieve(&polls, (char *)uuid, UUID_SIZE,
@@ -160 +164 @@
-      noit_check_update(existing_check, target, name, options,
-                           period, timeout, oncheck[0] ? oncheck : NULL,
-disabled
+flags
-      noitL(noit_debug, "reloaded uuid: %s\n", uuid_str);
-    }
@@ -166 +170 @@
-      noit_poller_schedule(target, module, name, options,
-                           period, timeout, oncheck[0] ? oncheck : NULL,
-disabled
+flags
-      noitL(noit_debug, "loaded uuid: %s\n", uuid_str);
-    }
@@ -274 +278 @@
-                  u_int32_t timeout,
-                  const char *oncheck,
-noit_conf_boolean disabled
+int flags
-  int8_t family;
-  int rv;
+  int mask = NP_DISABLED | NP_UNCONFIG;
-  union {
-    struct in_addr addr4;
@@ -291 +296 @@
-      noitL(noit_stderr, "Cannot translate '%s' to IP\n", target);
-      memset(&a, 0, sizeof(a));
-disabled = noit_true
+flags |= (NP_UNCONFIG & NP_DISABLED)
-    }
-  }
@@ -319 +324 @@
-  new_check->timeout = timeout;
-
-
+
+
-
-  /* This remove could fail -- no big deal */
@@ -341 +347 @@
-                     u_int32_t timeout,
-                     const char *oncheck,
-noit_conf_boolean disabled
+int flags
-                     uuid_t in,
-                     uuid_t out) {
@@ -356 +362 @@
-
-  noit_check_update(new_check, target, name, config,
-disabled
+flags
-  assert(noit_hash_store(&polls,
-                         (char *)new_check->checkid, UUID_SIZE,

src/noit_check.h

@@ -37 +37 @@
-#define NP_KILLED   0x00000002
-#define NP_DISABLED 0x00000004
+#define NP_UNCONFIG 0x00000008
-
-#define NP_UNKNOWN 0               /* stats_t.{available,state} */
@@ -97 +98 @@
-#define NOIT_CHECK_LIVE(a) ((a)->fire_event != NULL)
-#define NOIT_CHECK_DISABLED(a) ((a)->flags & NP_DISABLED)
+#define NOIT_CHECK_CONFIGURED(a) (((a)->flags & NP_UNCONFIG) == 0)
-#define NOIT_CHECK_RUNNING(a) ((a)->flags & NP_RUNNING)
-#define NOIT_CHECK_KILLED(a) ((a)->flags & NP_KILLED)
@@ -118 +120 @@
-                       u_int32_t timeout,
-                       const char *oncheck,
-noit_conf_boolean disabled
+int flags
-                       uuid_t in,
-                       uuid_t out);
@@ -130 +132 @@
-                    u_int32_t timeout,
-                    const char *oncheck,
-noit_conf_boolean disabled
+int flags
-
-API_EXPORT(int)

src/noit_conf.c

@@ -308 +308 @@
-  return 0;
-}
-
-
-
-
-
-
-
+
+
+
+
+
-  char argcopy[1024], *target, *name;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-  if(uuid_parse(argcopy, checkid) == 0) {
-    /* If they kill by uuid, we'll seek and destroy -- find it anywhere */
-sizeof(xpath)
+len
-             argcopy);
-  }
@@ -341 +328 @@
-    check = noit_poller_lookup_by_name(target, name);
-    if(!check) {
-      nc_printf(ncct, "could not find check %s`%s\n", target, name);
-      return -1;
-    }
-    uuid_unparse_lower(check->checkid, uuid_str);
-sizeof(xpath)
+len
-             uuid_str);
-  }
-  else {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
-  if(!pobj || pobj->type != XPATH_NODESET ||
@@ -934 +997 @@
-static
-void register_console_config_commands() {
+  cmd_info_t *showcmd;
-  noit_console_state_t *tl, *_conf_state, *_conf_t_state,
-                       *_write_state, *_attr_state,
@@ -964 +1028 @@
-  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, "check", noit_console_check, NULL, NULL);
-  ADD_CMD(_conf_t_state, "section", noit_console_config_section, NULL, (void *)0);
+
+  showcmd = noit_console_state_get_cmd(tl, "show");
+  ADD_CMD(showcmd->dstate, "check", noit_console_check, NULL, NULL);
+
-  DELEGATE_CMD(_conf_t_state, "write", _write_state);
-  DELEGATE_CMD(_conf_t_state, "attribute", _attr_state);

src/sample.conf

@@ -39 +39 @@
-  </listeners>
-  <checks>
+    <check uuid="1b4e28ba-2fa1-11d2-883f-b9b761bde3fb" />
-    <dc1 timeout="30000" period="60000">
-      <icmp module="ping_icmp" timeout="12000">