lighttpd
/
lighttpd2
2
0
Fork 0
Code Issues Wiki

[angel] Remove "-n" option from angel and docs (wasn't imlemented)

This commit is contained in:
Stefan Bühler 2010-10-02 23:14:56 +02:00
parent 715a75f0aa
commit b432e35eeb
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/lighttpd2.8
View File

@ -30,10 +30,6 @@ Use
\fImoduledir\fP
as the directory that contains modules, instead of the default.
.TP 8
\fB\-n, --no-daemon\fP
Do not daemonize (go into background). The default is to daemonize; but we
recommend using -n in combination with daemontools or runit.
.TP 8
\fB\--pid-file\ \fP \fIpidfile\fP
Location of the pid file (only valid in daemon mode).
.TP 8

5
src/angel/angel_main.c
View File

@ -23,7 +23,8 @@ int main(int argc, char *argv[]) {
GOptionContext *context;
/* options */
gboolean show_version = FALSE, no_fork = FALSE;
gboolean show_version = FALSE;
/* gboolean no_fork = FALSE; */
gchar const *const def_module_dir = DEFAULT_LIBDIR;
gchar const *module_dir = def_module_dir;
gboolean module_resident = FALSE;
@ -37,7 +38,7 @@ int main(int argc, char *argv[]) {
{ "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 [default: " DEFAULT_LIBDIR "]", "PATH" },
{ "module-resident", 0, 0, G_OPTION_ARG_NONE, &module_resident, "never unload modules (e.g. for valgrind)", NULL },
{ "no-daemon", 'n', 0, G_OPTION_ARG_NONE, &no_fork, "Don't fork (for daemontools)", NULL },
/* { "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 },
{ NULL, 0, 0, 0, NULL, NULL, NULL }