Browse Source

Fix module path handling in angel

personal/stbuehler/wip
Stefan Bühler 12 years ago
parent
commit
c89c194deb
  1. 2
      src/angel/angel_main.c
  2. 4
      src/angel/angel_plugin_core.c

2
src/angel/angel_main.c

@ -34,7 +34,7 @@ int main(int argc, char *argv[]) {
GOptionEntry entries[] = {
{ "config", 'c', 0, G_OPTION_ARG_FILENAME, &config_path, "filename/path of the config", "PATH" },
{ "module-dir", 'm', 0, G_OPTION_ARG_STRING, &module_dir, "module directory", "PATH" },
{ "module-dir", 'm', 0, G_OPTION_ARG_STRING, &module_dir, "module directory [default: " DEFAULT_LIBDIR "]", "PATH" },
{ "no-daemon", 'n', 0, G_OPTION_ARG_NONE, &no_fork, "Don't fork (for daemontools)", NULL },
{ "pid-file", 0, 0, G_OPTION_ARG_STRING, &pidfile, "Location of the pid file (only valid in daemon mode)", "PATH" },
{ "version", 'v', 0, G_OPTION_ARG_NONE, &show_version, "show version and exit", NULL },

4
src/angel/angel_plugin_core.c

@ -170,11 +170,9 @@ static void core_instance_parse(liServer *srv, liPlugin *p, liValue **options) {
g_ptr_array_add(cmd, g_strndup(CONST_STR_LEN("/etc/lighttpd2/lighttpd.conf")));
}
g_ptr_array_add(cmd, g_strndup(CONST_STR_LEN("-m")));
if (options[5]) {
g_ptr_array_add(cmd, g_strndup(CONST_STR_LEN("-m")));
g_ptr_array_add(cmd, g_strndup(GSTR_LEN(options[5]->data.string)));
} else {
g_ptr_array_add(cmd, g_strndup(CONST_STR_LEN("/usr/lib/lighttpd2/")));
}
if (options[9]) rlim_core = options[9]->data.number;

Loading…
Cancel
Save