diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2016-01-21 08:31:31 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2016-01-21 08:31:31 +0200 |
commit | 0c930fc6d3fde82e800c685ec1df92ddfa23fe09 (patch) | |
tree | 1494ff68c9006d3e1a9d6ab5b3b2a5e2f66a47ca /src/cmdline.opt | |
parent | 2040ea870ae411472a73d0bee49fb7c4a774ad93 (diff) | |
download | pies-0c930fc6d3fde82e800c685ec1df92ddfa23fe09.tar.gz pies-0c930fc6d3fde82e800c685ec1df92ddfa23fe09.tar.bz2 |
Cleanup: redo configuration file handling and dependency tracking.
Implement clean configuration reload on SIGHUP.
Use SIGUSR1 to restart the program (previously initiated by SIGHUP).
* src/Makefile.am (pies_SOURCES): Add comp.c
* src/comp.c: New file.
* src/acl.c (pies_acl_free): Don't coredump on NULL arg.
(_parse_from): Set cmp function for the sockaddr list.
(_acl_common_section_parser): Set cmp function for the ACL
(pies_acl_cmp): New function.
* src/acl.h (pies_acl_cmp): New proto.
* src/cmdline.opt: Remove option --dump-prereq. Add options
--trace-prereq and --trace-depend.
* src/ctl.c: Use prog_tag to access tag of struct prog.
* src/depmap.c (depmap_clear)
(depmap_clear_all): New functions.
* src/inetd.c (inetd_conf_file): Don't register prog right
away. This is done later in component_config_commit.
(inetd_parse_conf): Rename to inetd_config_parse.
* src/limits.c (limits_cmp): New function.
* src/pies.c (config_file): Replace with struct config_syntax.
(str_to_config_syntax): Return a pointer to struct config_syntax.
(add_config): Rename to config_file_add.
(config_file_add_type): New function.
(return_code_keywords, create_action): Change handling of actions.
(return_code_section_parser): Likewise.
(component_verify, component_create)
(component_free, component_finish): Move to comp.c
(config_parse): Remove.
(pies_config_parse): New function.
(pies_read_config,pies_reload): New function.
(pies_reload): Rename to request_reload.
(pies_status): Rename to request_status.
(pies_stop): Rename to request_stop.
(main): Change configuration file handling.
SIGHUP reloads configuration, instead of restarting the program.
(default_sigv,sig_handler): Handle SIGUSR1.
* src/pies.h (component): New members: prev, next, listidx, arridx,
ref_count, prog.
Remove act_head, act_tail, act_temp.
Add new prototypes.
* src/prog.h (prog): Remove tag and prereq.
* src/progman.c (prog_tag): New function.
(destroy_prog): Update component reference count.
(register_redir): Likewise.
(register_prog0): Take one argument.
Update component reference count.
(register_prog): Update comp->prog
(prog_rebuild_prerequisites): Remove.
(component_fixup_depend): Remove.
(fixup_prerequisites,rebuild_prerequisites)
(print_dep,progman_dump_prereq)
(progman_dump_depmap,progman_build_depmap): Remove.
(prog_start_prerequisites): Scan depmap to find prerequisites.
(prog_stop_dependents): Likewise.
(progman_wait): Remove.
(progman_wait_until): New function.
(progman_stop): Rewrite using progman_wait_until.
(react): Rewrite using grecs_list
* src/sysvinit.c: Use prog_tag when needed.
* src/userprivs.c (pies_privs_cmp, pies_privs_free): New functions.
* grecs: Update.
* lib/safe_strcmp.c: New file.
* lib/Makefile.am: Add safe_strcmp.c
* lib/libpies.h (safe_strcmp): New proto.
Diffstat (limited to 'src/cmdline.opt')
-rw-r--r-- | src/cmdline.opt | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/cmdline.opt b/src/cmdline.opt index f43d147..389cea7 100644 --- a/src/cmdline.opt +++ b/src/cmdline.opt @@ -26,7 +26,7 @@ GROUP(Operation Mode) OPTION(config-file,c,FILE, [<use FILE instead of the default configuration>]) BEGIN - add_config (current_syntax, optarg); + config_file_add (current_syntax, optarg); END OPTION(config-help,,, @@ -60,7 +60,7 @@ OPTION(inetd,i,, BEGIN if (!instance) instance = "inetd"; - current_syntax = CONF_INETD; + current_syntax = &config_syntax_tab[CONF_INETD]; inetd_mode = 1; END @@ -91,7 +91,8 @@ END OPTION(syntax,,[<{pies|meta1|inetd|inittab}>], [<expect configuration files in the given syntax>]) BEGIN - if (str_to_config_syntax (optarg, ¤t_syntax)) + current_syntax = str_to_config_syntax (optarg); + if (!current_syntax) { logmsg (LOG_ERR, _("unknown syntax type: %s"), optarg); exit (EX_USAGE); @@ -152,7 +153,7 @@ OPTION(restart-component,R,, [<restart components named in the command line>]) BEGIN log_to_stderr_only = 1; - command = COM_RESTART; + command = COM_RESTART_COMPONENT; END OPTION(status,s,, @@ -178,11 +179,18 @@ BEGIN command = COM_DUMP_DEPMAP; END -OPTION(dump-prereq,,, - [<dump prerequisite charts>]) +OPTION(trace-depend,,, + [<trace dependencies>]) BEGIN log_to_stderr_only = 1; - command = COM_DUMP_PREREQ; + command = COM_TRACE_DEPEND; +END + +OPTION(trace-prereq,,, + [<trace prerequisites>]) +BEGIN + log_to_stderr_only = 1; + command = COM_TRACE_PREREQ; END OPTION(source-info,,, |