[Reconnoiter-devel] [reconnoiter commit] Reconnoiter branch, master, updated. 41959b7938b249031e78a2d70002aeb6837ecfd8

git at labs.omniti.com git at labs.omniti.com
Tue Apr 10 12:30:03 EDT 2012


Pushed by: jesus
The branch, master has been updated
       via  41959b7938b249031e78a2d70002aeb6837ecfd8 (commit)
      from  dd70a94b7c59be94a8e875042426a6d3cec9c037 (commit)

Summary of changes:
 src/noit_check_tools.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

Log:
commit 41959b7938b249031e78a2d70002aeb6837ecfd8
Author: Theo Schlossnagle <jesus at omniti.com>
Date:   Tue Apr 10 16:24:41 2012 +0000

    Now that we've made it survive the attempt to run a check twice,
    we should just log a message that there could be a problem if
    the check is non-transient and give running the check out best
    effort.

diff --git a/src/noit_check_tools.c b/src/noit_check_tools.c
index 2f9dbae..3220391 100644
--- a/src/noit_check_tools.c
+++ b/src/noit_check_tools.c
@@ -75,12 +75,10 @@ noit_check_recur_handler(eventer_t e, int mask, void *closure,
         NOIT_CHECK_DISPATCH(id, rcl->check->module, rcl->check->name,
                             rcl->check->target);
       }
-      if(ms < rcl->check->timeout)
-        noitL(noit_error, "skipping %s, can't finish in %dms (timeout %dms)\n",
+      if(ms < rcl->check->timeout && !(rcl->check->flags & NP_TRANSIENT))
+        noitL(noit_error, "%s might not finish in %dms (timeout %dms)\n",
               rcl->check->name, ms, rcl->check->timeout);
-      else {
-        rcl->dispatch(rcl->self, rcl->check, rcl->cause);
-      }
+      rcl->dispatch(rcl->self, rcl->check, rcl->cause);
     }
     check_postflight_hook_invoke(rcl->self, rcl->check, rcl->cause);
   }




hooks/post-receive
-- 
Reconnoiter


More information about the Reconnoiter-devel mailing list