Show
Ignore:
Timestamp:
05/13/11 18:08:50 (3 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1305310130 -0400
git-parent:

[455a074bf6e14a902cd90354154398733bedec34]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1305310130 -0400
Message:

make the noit_conf_load switch to error logging, load, then xml_debugg logging for xml errors

Files:

Legend:

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

    r4500c97 r2357078  
    331331} 
    332332 
    333 int noit_conf_load(const char *path) { 
     333static int noit_conf_load_internal(const char *path) { 
    334334  int rv = 0; 
    335335  xmlDocPtr new_config; 
     
    360360  } 
    361361  rv = -1; 
     362  return rv; 
     363} 
     364int noit_conf_load(const char *path) { 
     365  int rv; 
     366  XML2LOG(noit_error); 
     367  rv = noit_conf_load_internal(path); 
     368  XML2LOG(xml_debug); 
    362369  return rv; 
    363370} 
     
    752759                 noit_console_state_t *state, void *closure) { 
    753760  XML2CONSOLE(ncct); 
    754   if(noit_conf_load(master_config_file)) { 
     761  if(noit_conf_load_internal(master_config_file)) { 
    755762    XML2LOG(xml_debug); 
    756763    nc_printf(ncct, "error loading config\n");