Changeset fc9516a2d8a7585aaaffbaab77009199ca907c90

Timestamp:

06/05/08 14:46:45 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[483ffbb2a71b31651cb48c74c7436508890169f4]

git-author:

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

Message:

make loaders have configs, add a directory config to lua for pulling scripts, refs #28

Files:

• src/modules/lua.c (modified) (7 diffs)
• src/noit_module.c (modified) (2 diffs)
• src/noit_module.h (modified) (3 diffs)

src/modules/lua.c

@@ -18 +18 @@
-static noit_log_stream_t nldeb = NULL;
-static noit_hash_table noit_coros = NOIT_HASH_EMPTY;
+
+struct loader_conf {
+  char *script_dir;
+};
+static struct loader_conf *__get_loader_conf(noit_module_loader_t *self) {
+  struct loader_conf *c;
+  c = noit_image_get_userdata(&self->hdr);
+  if(!c) {
+    c = calloc(1, sizeof(*c));
+    noit_image_set_userdata(&self->hdr, c);
+  }
+  return c;
+}
+static void
+noit_lua_loader_set_directory(noit_module_loader_t *self, char *dir) {
+  struct loader_conf *c = __get_loader_conf(self);
+  if(c->script_dir) free(c->script_dir);
+  c->script_dir = strdup(dir);
+}
+static const char *
+noit_lua_loader_get_directory(noit_module_loader_t *self) {
+  struct loader_conf *c = __get_loader_conf(self);
+  return c->script_dir;
+}
-
-noit_lua_check_info_t *
@@ -556 +580 @@
-}
-static noit_module_t *
-
-
-
+er_load
+       
+       
-  noit_module_t *m;
-  lua_State *L;
@@ -564 +588 @@
-  char *script;
-  char *object;
+  char scriptfile[MAXPATHLEN];
-  
-  noitL(nldeb, "Loading lua module: %s\n", module_name);
@@ -575 +600 @@
-    return NULL;
-  }
+  snprintf(scriptfile, sizeof(scriptfile), "%s/%s",
+           noit_lua_loader_get_directory(loader), script);
+  free(script);
-
-  m = noit_blank_module();
@@ -584 +612 @@
-  lmc = calloc(1, sizeof(*lmc));
-  lmc->object = object;
-cript
+trdup(scriptfile)
-
-  L = lmc->lua_state = lua_open();
@@ -616 +644 @@
-
-static int
+noit_lua_loader_config(noit_module_loader_t *self, noit_hash_table *o) {
+  char *dir = ".";
+  noit_hash_retrieve(o, "directory", strlen("directory"), (void **)&dir);
+  noit_lua_loader_set_directory(self, dir);
+  return 0;
+}
+static int
-noit_lua_loader_onload(noit_image_t *self) {
-  nlerr = noit_log_stream_find("error/serf");
@@ -632 +667 @@
-    noit_lua_loader_onload,
-  },
-
+
+
+
-};

src/noit_module.c

@@ -27 +27 @@
-    NULL
-  },
+  NULL,
+  NULL,
-  noit_load_module_image
-};
@@ -191 +193 @@
-      continue;
-    }
+    if(loader->config) {
+      int rv;
+      noit_hash_table *config;
+      config = noit_conf_get_hash(sections[i], "config");
+      rv = loader->config(loader, config);
+      if(rv == 0) {
+        noit_hash_destroy(config, free, free);
+        free(config);
+      }
+      else if(rv < 0) {
+        noitL(noit_stderr, "Failed to config loader %s\n", loader_name);
+        continue;
+      }
+    }
+    if(loader->init && loader->init(loader))
+      noitL(noit_stderr, "Failed to init loader %s\n", loader_name);
-  }
-  if(sections) free(sections);

src/noit_module.h

@@ -12 +12 @@
-
-#define NOIT_LOADER_MAGIC         0xA7AD7104
-2
+3
-
-typedef struct _noit_image {
@@ -23 +23 @@
-} noit_image_t;
-
+/* onload: is called immediately after the module is loaded and before it
+ *         is configured.
+ */
+
-typedef struct _noit_module_loader {
-  noit_image_t hdr;
+  int (*config)(struct _noit_module_loader *, noit_hash_table *config);
+  int (*init)(struct _noit_module_loader *);
-  struct _noit_module *(*load)(struct _noit_module_loader *loader,
-                               char *module_name,
-                               noit_conf_section_t section);
-} noit_module_loader_t;
+
+/* config:  is called once to configure the loader itself
+ *   init:  is called once, post config to initialize the module
+ *   load:  is called each time the loader is asked to load a module
+ */
-
-#define NOIT_MODULE_MAGIC         0x4017DA7A
@@ -41 +52 @@
-  void (*cleanup)(struct _noit_module *, noit_check_t *);
-} noit_module_t;
+
+/*         config: is called to pass the config into the module.
+ *           init: is called once to initialize the module
+ * initiate_check: is called so start the module against checks
+ *        cleanup: is called if a particular check is stopped
+ */
-
-#define NOIT_IMAGE_MAGIC(a)          ((a)->magic)