Changeset 601028a0cf532695cb9ad0c413614254754dcf16

Timestamp:

03/02/08 03:12:43 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1204427563 +0000

git-parent:

[bd54e8d25218b7d09076b7b541c108a2a68fe992]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1204427563 +0000

Message:

funnel XML errors through the noit_log framework. -- allow 'on' as a boolean true

Files:

• src/noit_conf.c (modified) (2 diffs)

src/noit_conf.c

@@ -44 +44 @@
-};
-
+void noit_conf_xml_error_func(void *ctx, const char *format, ...) {
+  struct timeval __now;
+  noit_log_stream_t ls = ctx;
+  va_list arg;
+  if(!ls) return;
+  va_start(arg, format);
+  gettimeofday(&__now,  NULL);
+  noit_vlog(ls, &__now, __FILE__, __LINE__, format, arg);
+  va_end(arg);
+}
+void noit_conf_xml_error_ext_func(void *ctx, xmlErrorPtr err) {
+  struct timeval __now;
+  noit_log_stream_t ls = ctx;
+  if(!ls) return;
+  gettimeofday(&__now,  NULL);
+  if(err->file)
+    noit_log(ls, &__now, err->file, err->line,
+             "XML error [%d/%d] in %s on line %d %s\n",
+             err->domain, err->code, err->file, err->line, err->message);
+  else
+    noit_log(ls, &__now, err->file, err->line,
+             "XML error [%d/%d] %s\n",
+             err->domain, err->code, err->message);
+}
-void noit_conf_init(const char *toplevel) {
-  int i;
-  char keystr[256];
+  xmlSetGenericErrorFunc(noit_error, noit_conf_xml_error_func);
+  xmlSetStructuredErrorFunc(noit_error, noit_conf_xml_error_ext_func);
-  for(i = 0; config_info[i].key != NULL; i++) {
-    snprintf(keystr, sizeof(keystr), config_info[i].key, toplevel);
@@ -339 +365 @@
-  char *str;
-  if(_noit_conf_get_string(section,NULL,path,&str)) {
-
+
+
-    else *value = noit_false;
-    return 1;