Changeset e102af344eb4afacdeeb549fb60d77715f815a53

Timestamp:

01/27/08 04:24:46 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[625628acfb7f3623d81f48a89a59459ebbb8dfd9]

git-author:

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

Message:

modules actually load now.

Files:

• src/modules/ping_icmp.c (modified) (1 diff)
• src/noit_conf.c (modified) (1 diff)
• src/noit_conf.h (modified) (2 diffs)
• src/noit_module.c (modified) (4 diffs)
• src/noit_module.h (modified) (2 diffs)
• src/noitd.c (modified) (2 diffs)
• src/sample.conf (modified) (1 diff)

src/modules/ping_icmp.c

@@ +1 @@
+/*
+ * Copyright (c) 2007, OmniTI Computer Consulting, Inc.
+ * All rights reserved.
+ */
+
+#include "noit_defines.h"
+
+#include "noit_module.h"
+#include "noit_poller.h"
+
+static int ping_icmp_onload(noit_module_t *self) {
+  return 0;
+}
+static int ping_icmp_config(noit_module_t *self, noit_hash_table *options) {
+  return 0;
+}
+static int ping_icmp_init(noit_module_t *self) {
+  return 0;
+}
+static int ping_icmp_initiate_check(noit_module_t *self, noit_check_t check) {
+  return 0;
+}
+
+noit_module_t ping_icmp = {
+  NOIT_MODULE_MAGIC,
+  NOIT_MODULE_ABI_VERSION,
+  "ping_icmp",
+  "ICMP based host availability detection",
+  ping_icmp_onload,
+  ping_icmp_config,
+  ping_icmp_init,
+  ping_icmp_initiate_check
+};
+

src/noit_conf.c

@@ -66 +66 @@
-}
-
+noit_hash_table *noit_conf_get_hash(noit_conf_section_t section,
+                                    const char *path) {
+  int i, cnt;
+  noit_hash_table *table;
+  xmlXPathObjectPtr pobj;
+  xmlXPathContextPtr current_ctxt;
+  xmlNodePtr current_node = (xmlNodePtr)section;
+  xmlNodePtr node;
+
+  table = calloc(1, sizeof(*table));
+  current_ctxt = xpath_ctxt;
+  if(current_node) {
+    current_ctxt = xmlXPathNewContext(master_config);
+    current_ctxt->node = current_node;
+  }
+  pobj = xmlXPathEval((xmlChar *)path, current_ctxt);
+  if(!pobj) goto out;
+  if(pobj->type != XPATH_NODESET) goto out;
+  if(xmlXPathNodeSetIsEmpty(pobj->nodesetval)) goto out;
+  cnt = xmlXPathNodeSetGetLength(pobj->nodesetval);
+  for(i=0; i<cnt; i++) {
+    char *value;
+    node = xmlXPathNodeSetItem(pobj->nodesetval, i);
+    value = (char *)xmlXPathCastNodeSetToString(pobj->nodesetval);
+    noit_hash_replace(table,
+                      strdup((char *)node->name), strlen((char *)node->name),
+                      strdup(value), free, free);
+  }
+ out:
+  if(current_ctxt && current_ctxt != xpath_ctxt)
+    xmlXPathFreeContext(current_ctxt);
+  return table;
+}
-noit_conf_section_t noit_conf_get_section(noit_conf_section_t section,
-                                          const char *path) {

src/noit_conf.h

@@ -8 +8 @@
-
-#include "noit_defines.h"
+#include "utils/noit_hash.h"
-
-typedef enum { noit_true, noit_false } noit_conf_boolean;
@@ -21 +22 @@
-  noit_conf_get_sections(noit_conf_section_t section, const char *path,
-                         int *cnt);
+
+API_EXPORT(noit_hash_table *)
+  noit_conf_get_hash(noit_conf_section_t section, const char *path);
-
-API_EXPORT(int) noit_conf_get_string(noit_conf_section_t section,

src/noit_module.c

@@ -23 +23 @@
-  noit_module_t *module;
-
-
+NULL, 
-    base = strdup("");
-
@@ -48 +48 @@
-  }
-
-
-
+
-    noit_log(noit_stderr, NULL, "I can't understand module %s\n", name);
-    dlclose(dlhandle);
@@ -55 +54 @@
-  }
-
+  module = calloc(1, sizeof(*module));
+  memcpy(module, dlsymbol, sizeof(*module));
+
+  if(module->onload(module)) {
+    free(module);
+    return -1;
+  }
-  noit_hash_store(&modules, module->name, strlen(module->name), module);
-  return 0;
@@ -68 +74 @@
-}
-
+void noit_module_init() {
+  noit_conf_section_t *sections;
+  int i, cnt = 0;
+
+  sections = noit_conf_get_sections(NULL, "/global/modules/module", &cnt);
+  if(!sections) return;
+  for(i=0; i<cnt; i++) {
+    noit_hash_table *config;
+    noit_module_t *module;
+    char module_file[PATH_MAX];
+    char module_name[256];
+    if(!noit_conf_get_stringbuf(sections[i], "image",
+                                module_file, sizeof(module_file))) {
+      noit_log(noit_stderr, NULL,
+               "No image defined in module stanza %d\n", i+1);
+      continue;
+    }
+    if(!noit_conf_get_stringbuf(sections[i], "name",
+                                module_name, sizeof(module_name))) {
+      noit_log(noit_stderr, NULL,
+               "No name defined in module stanza %d\n", i+1);
+      continue;
+    }
+    if(noit_module_load(module_file, module_name)) {
+      noit_log(noit_stderr, NULL,
+               "Could not load %s:%s\n", module_file, module_name);
+      continue;
+    }
+    config = noit_conf_get_hash(sections[i], "config/*");
+    module = noit_module_lookup(module_name);
+    if(module->config(module, config)) {
+      noit_log(noit_stderr, NULL,
+               "Configure failed on %s:%s\n", module_file, module_name);
+      continue;
+    }
+    noit_log(noit_stderr, NULL, "Module %s:%s successfully loaded.\n",
+             module_file, module_name);
+  }
+}

src/noit_module.h

@@ -11 +11 @@
-#include "noit_poller.h"
-
-
+
+
-
-
+_noit_module 
-  uint32_t magic;
-  uint32_t version;
-  char *name;
-  char *description;
-
-
-
-
+struct _noit_module *
+struct _noit_module *, 
+struct _noit_module *
+struct _noit_module *, 
-} noit_module_t;
-
@@ -30 +31 @@
-  ((MODULE_MAGIC(a) == NOIT_MODULE_MAGIC)?0:-1)
-
+API_EXPORT(void)
+  noit_module_init();
-API_EXPORT(int)
-  noit_module_load(const char *file, const char *name);

src/noitd.c

@@ -12 +12 @@
-#include "noit_listener.h"
-#include "noit_console.h"
+#include "noit_module.h"
-#include "noit_conf.h"
-
@@ -65 +66 @@
-  }
-  noit_console_init();
-
+
-  noit_listener_init();
-

src/sample.conf

@@ -6 +6 @@
-  <modules>
-    <directory>./modules</directory>
+    <module>
+      <image>ping_icmp</image>
+      <name>ping_icmp</name>
+      <config>
+        <key1>value2</key1>
+        <key2>value2</key2>
+      </config>
+    </module>
-  </modules>
-  <listeners>