diff options
| author | Sergey Poznyakoff <gray@gnu.org> | 2016-01-02 23:58:06 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org> | 2016-01-02 23:58:06 +0200 |
| commit | 6db017a32e379bb2eb7878771dea969f77c3168c (patch) | |
| tree | 0e1563b8239f7c681708c64c0d693f6541e4e155 /src/pies.h | |
| parent | 061afaf6385340f87bbeaa6d7e8ff6befa532551 (diff) | |
| download | pies-6db017a32e379bb2eb7878771dea969f77c3168c.tar.gz pies-6db017a32e379bb2eb7878771dea969f77c3168c.tar.bz2 | |
Switch to new control interface.
Old control options (--status, --restart-components) rewritten using
piesctl.
SIGUSR1 and SIGUSR2 no longer handled.
* lib/arraymember.c (array_index): New function.
* lib/libpies.h: Likewise.
* src/cmdline.opt: Fix copyright years.
* src/piesctl-cl.opt: Likewise.
* src/ctl.c (ctlio_do_command): Implement restart.
(pies_control_url): New function.
(eval_env): rename json to result.
New member cond.
Restore pcond_ functions.
(json_to_pcond): New function.
(res_programs): Conditional selection of programs to list.
Implement restart.
* src/pies.c (ctlfile, statfile): Remove.
(pies_keywords): Mark control-file and stat-file as inactive.
(default_sigv): Remove SIGUSR1 and SIGUSR2
(pies_check_status): Don't send SIGUSR2.
(stop_components): Remove.
(request_restart_components): Rewrite as a wrapper.
Call piesctl to do the job.
(list_components): New function.
* src/pies.h (ACTION_COMPRELOAD)
(ACTION_DUMPSTATS): Remove. All callers changed.
(progman_dump_stats): Remove.
* src/piesctl.c (shttp_request_send): Don't initialize conn->req; the
caller is responsible for that.
(parse_condition, json_to_string)
(parse_condition_to_uri): New functions.
(com_list): Read conditional expression from the command line.
(com_restart): Implement.
* src/progman.c (progman_dump_stats): Remove.
Diffstat (limited to 'src/pies.h')
| -rw-r--r-- | src/pies.h | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1,3 +1,3 @@ /* This file is part of GNU Pies. - Copyright (C) 2008, 2009, 2010, 2011, 2013-2015 Sergey Poznyakoff + Copyright (C) 2008-2011, 2013-2016 Sergey Poznyakoff @@ -269,4 +269,2 @@ enum pies_action { ACTION_RESTART, - ACTION_COMPRELOAD, - ACTION_DUMPSTATS, ACTION_CTRLALTDEL, @@ -319,3 +317,2 @@ void progman_filter (int (*filter) (struct component *, void *data), void progman_stop_tag (const char *name); -void progman_dump_stats (const char *filename); void progman_dump_prereq (void); @@ -543 +540,2 @@ extern struct control control; void ctl_open(void); +char const *pies_control_url (void); |