Merge pull request #411 from circonus-labs/lua_initiate_once

Support different initiation on 'once' invocations.
circonus-labs · Nov 3, 2017 · 2054dcc · 2054dcc
2 parents d6d28ff + 1aaee50
commit 2054dcc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/src/modules/lua_check.c b/src/modules/lua_check.c
@@ -1057,8 +1057,8 @@ int_cl_free(void *vcl) {
 }
 
 static int
-noit_lua_initiate(noit_module_t *self, noit_check_t *check,
-                  noit_check_t *cause) {
+noit_lua_initiate_ex(noit_module_t *self, noit_check_t *check,
+                     noit_check_t *cause, mtev_boolean once) {
   LMC_DECL(L, self, object);
   /* deal with unused warning */
   (void)L;
@@ -1122,7 +1122,8 @@ noit_lua_initiate(noit_module_t *self, noit_check_t *check,
     noit_lua_setup_check(ri->coro_state, ci->cause);
   else
     lua_pushnil(ri->coro_state);
-  mtev_lua_lmc_resume(lmc, ri, 3);
+  lua_pushboolean(ri->coro_state, once);
+  mtev_lua_lmc_resume(lmc, ri, 4);
   return 0;
 
  fail:
@@ -1131,11 +1132,24 @@ noit_lua_initiate(noit_module_t *self, noit_check_t *check,
   return -1;
 }
 
+static int
+noit_lua_initiate(noit_module_t *self, noit_check_t *check,
+                  noit_check_t *cause) {
+  return noit_lua_initiate_ex(self, check, cause, mtev_false);
+}
+
+static int
+noit_lua_initiate_once(noit_module_t *self, noit_check_t *check,
+                       noit_check_t *cause) {
+  return noit_lua_initiate_ex(self, check, cause, mtev_true);
+}
+
 /* This is the standard wrapper */
 static int
 noit_lua_module_initiate_check(noit_module_t *self, noit_check_t *check,
                                int once, noit_check_t *cause) {
-  INITIATE_CHECK(noit_lua_initiate, self, check, cause);
+  INITIATE_CHECK_EX(noit_lua_initiate, noit_lua_initiate_once,
+                    self, check, cause);
   return 0;
 }
 

diff --git a/src/noit_check_tools.h b/src/noit_check_tools.h
@@ -160,11 +160,11 @@ MTEV_HOOK_PROTO(check_postflight,
   } \
 } while(0)
 
-#define INITIATE_CHECK(func, self, check, cause) do { \
+#define INITIATE_CHECK_EX(func, oncefunc, self, check, cause) do { \
   if(once) { \
     if(MTEV_HOOK_CONTINUE == \
        check_preflight_hook_invoke(self, check, cause)) \
-      func(self, check, cause); \
+      oncefunc(self, check, cause); \
     check_postflight_hook_invoke(self, check, cause); \
   } \
   else if(!check->fire_event) { \
@@ -174,5 +174,9 @@ MTEV_HOOK_PROTO(check_postflight,
   } \
 } while(0)
 
+#define INITIATE_CHECK(func, self, check, cause) do { \
+  INITIATE_CHECK_EX(func, func, self, check, cause); \
+} while(0)
+
 #endif