Changeset 5b175f1d6f70b127b0df3c66d53fff4ec99c769b

Show
Ignore:
Timestamp:
03/16/09 19:18:17 (5 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1237231097 +0000
git-parent:

[31eed12e59a6d35dbdc8812d8a54d76864f05df4]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1237231097 +0000
Message:

ensure it is disables, refs #107

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/noit_check.c

    rfc52ce1 r5b175f1  
    213213noit_check_activate(noit_check_t *check) { 
    214214  noit_module_t *mod; 
     215  if(NOIT_CHECK_LIVE(check)) return 0; 
    215216  mod = noit_module_lookup(check->module); 
    216   if(mod && mod->initiate_check && !NOIT_CHECK_LIVE(check)) { 
     217  if(mod && mod->initiate_check) { 
    217218    if((check->flags & NP_DISABLED) == 0) { 
    218219      mod->initiate_check(mod, check, 0, NULL); 
     
    224225  } 
    225226  else { 
    226     noitL(noit_stderr, "Cannot find module '%s'\n", check->module); 
    227     check->flags |= NP_DISABLED; 
     227    if(!mod) { 
     228      noitL(noit_stderr, "Cannot find module '%s'\n", check->module); 
     229      check->flags |= NP_DISABLED; 
     230    } 
    228231  } 
    229232  return 0; 
     
    566569    return -1; 
    567570  } 
     571  checker->flags |= (NP_DISABLED|NP_KILLED); 
     572 
    568573  if(checker->flags & NP_RUNNING) { 
    569     checker->flags |= NP_KILLED; 
    570574    return 0; 
    571575  } 
    572   checker->flags |= NP_KILLED; 
    573576 
    574577  noit_skiplist_remove(&polls_by_name, checker, NULL);