Changeset e437d462c935dbd146a664ca0f0119405bf487dc for src

Timestamp:

08/10/11 17:31:46 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1312997506 -0400

git-parent:

[f91ddca09660d8415b1bcdd88b20946e82b0ef62]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1312997506 -0400

Message:

Expose the cause of an oncheck fire into lua

Files:

• src/modules/lua.c (modified) (6 diffs)
• src/noit_check.c (modified) (5 diffs)

src/modules/lua.c

@@ -249 +249 @@
-}
-static int
+noit_lua_get_available(lua_State *L) {
+  char av[2] = { '\0', '\0' };
+  noit_check_t *check;
+  noit_lua_check_info_t *ci;
+  if(lua_gettop(L)) luaL_error(L, "wrong number of arguments");
+  check = lua_touserdata(L, lua_upvalueindex(1));
+  av[0] = (char)check->stats.current.available;
+  lua_pushstring(L, av);
+  return 1;
+}
+static int
-noit_lua_set_available(lua_State *L) {
-  noit_check_t *check;
@@ -257 +268 @@
-  ci->current.available = lua_tointeger(L, lua_upvalueindex(2));
-  return 0;
+}
+static int
+noit_lua_get_state(lua_State *L) {
+  char status[2] = { '\0', '\0' };
+  noit_check_t *check;
+  noit_lua_check_info_t *ci;
+  if(lua_gettop(L)) luaL_error(L, "wrong number of arguments");
+  check = lua_touserdata(L, lua_upvalueindex(1));
+  status[0] = (char)check->stats.current.state;
+  lua_pushstring(L, status);
+  return 1;
-}
-static int
@@ -373 +395 @@
-        lua_pushcclosure(L, noit_lua_set_available, 2);
-      }
+      else if(!strcmp(k, "availability")) {
+        lua_pushlightuserdata(L, check);
+        lua_pushcclosure(L, noit_lua_get_available, 1);
+      }
-      else break;
-      return 1;
@@ -423 +449 @@
-      return 1;
-    case 's':
-
+
+
+
+
+
-        lua_pushlightuserdata(L, check);
-        lua_pushcclosure(L, noit_lua_set_status, 1);
@@ -612 +642 @@
-  ci->current.duration = duration.tv_sec * 1000 + duration.tv_usec / 1000;
-
-
+
+
+
+
-  free(ci->current.status);
-}
@@ -755 +788 @@
-  noit_lua_setup_module(ci->coro_state, ci->self);
-  noit_lua_setup_check(ci->coro_state, ci->check);
-
+
+
-  noit_lua_resume(ci, 3);
-

src/noit_check.c

@@ -121 +121 @@
-  if(start_offset_ms == -1)
-    start_offset_ms = drand48() * noit_check_max_initial_stutter();
-
+ && check->period
-    max = noit_check_max_initial_stutter();
-    offset = start_offset_ms + drand48() * 1000;
@@ -336 +336 @@
-    if(check->oncheck) {
-      /* This service is causally triggered by another service */
+      uuid_t id;
-      char fullcheck[1024];
-      char *name = check->oncheck;
@@ -341 +342 @@
-
-      noitL(noit_debug, "Searching for upstream trigger on %s\n", name);
+      parent = NULL;
+      if(uuid_parse(check->oncheck, id) == 0) {
+        target = "";
+        parent = noit_poller_lookup(id);
+      }
-      if((target = strchr(check->oncheck, '`')) != NULL) {
-
++ 1 
-        name = target + 1;
-        target = fullcheck;
+        parent = noit_poller_lookup_by_name(target, name);
-      }
-
-
-
-
+
+
+
+
+
-      if(!parent) {
-        check->flags |= NP_DISABLED;
@@ -861 +869 @@
-}
-
+static int
+bad_check_initiate(noit_module_t *self, noit_check_t *check,
+                   int once, noit_check_t *cause) {
+  /* self is likely null here -- why it is bad, in fact */
+  /* this is only suitable to call in one-offs */
+  stats_t current;
+  char buff[256];
+  if(!once) return -1;
+  if(!check) return -1;
+  assert(!(check->flags & NP_RUNNING));
+  check->flags |= NP_RUNNING;
+  noit_check_stats_clear(&current);
+  gettimeofday(&current.whence, NULL);
+  current.duration = 0;
+  current.available = NP_UNKNOWN;
+  current.state = NP_UNKNOWN;
+  snprintf(buff, sizeof(buff), "check[%s] implementation offline",
+           check->module);
+  current.status = buff;
+  noit_check_set_stats(self, check, &current);
+  check->flags &= ~NP_RUNNING;
+  return 0;
+}
-void
-noit_check_stats_clear(stats_t *s) {
@@ -1134 +1165 @@
-    noit_module_t *mod;
-    mod = noit_module_lookup(dep->check->module);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  }
-}